GNOME.org
 

[gnome-backgrounds] More cleanup for 3.6

commit 92d440d6ecb507972705daf419a8a9e71cfcbdd3
Author: Jakub Steiner <jimmac gmail com>
Date:   Fri Aug 17 21:21:30 2012 +0200

    More cleanup for 3.6
    
    - lower redundancy, provide more variation

 AUTHORS                                 |   37 +++------
 backgrounds/Aqua.jpg                    |  Bin 200353 -> 0 bytes
 backgrounds/Fabric.jpg                  |  Bin 0 -> 444406 bytes
 backgrounds/FreshFlower.jpg             |  Bin 80905 -> 0 bytes
 backgrounds/Garden.jpg                  |  Bin 264831 -> 0 bytes
 backgrounds/GreenMeadow.jpg             |  Bin 183377 -> 0 bytes
 backgrounds/Makefile.am                 |   12 +--
 backgrounds/Spaceflare-nova.jpg         |  Bin 297020 -> 0 bytes
 backgrounds/SundownDunes.jpg            |  Bin 1799978 -> 0 bytes
 backgrounds/Terraform-blue.jpg          |  Bin 424750 -> 0 bytes
 backgrounds/Terraform-orange.jpg        |  Bin 493641 -> 0 bytes
 backgrounds/Tulip.jpg                   |  Bin 0 -> 627111 bytes
 backgrounds/TwoWings.jpg                |  Bin 881400 -> 0 bytes
 backgrounds/YellowFlower.jpg            |  Bin 267440 -> 0 bytes
 backgrounds/gnome-backgrounds.xml.in.in |  139 ++++++++-----------------------
 15 files changed, 47 insertions(+), 141 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index a9f4f51..da526b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,45 +1,30 @@
 Image Authors:
 
 - Chmiri.jpg:
-- Terraform*:
-- Spaceflare*:
+- Terraform-green.jpg:
+- Spaceflare.jpg:
 - Stamps.jpg:
 - UnderLit.jpg:
 - ZvonecKonec.jpg:
   Copyright  2011 Jakub Steiner <jimmac gmail com>
   Licensed under Creative Commons Attribution-ShareAlike 3.0 License.
 
-- SundownDunes:
-  Copyright  2011 Garrett LeSage
-  Licensed under Creative Commons Attribution-ShareAlike 3.0 License.
-
-- Aqua.jpg:
-  Copyright  2008 Charles Barbin <barbinch free fr>
-
 - Blinds.jpg:
   Copyright  2008 Lennart Poettering <mztabzr 0pointer de>
   Copyright  2008 Andrea Cimitan
 
+- Fabric.jpg:
+  Copyright  2011 Quinn Anya
+  Copyright  2012 Jakub Steiner
+  Licensed under Creative Commons Attribution-ShareAlike 2.0 License.
+  
 - FootFall.png:
   Copyright  2011 Nieves SÃnchez MartÃnez <nievesanchez hotmail com>
   Licensed under Creative Commons Attribution-ShareAlike 3.0 License.
 
-- FreshFlower.jpg:
-  Copyright  2005 Jens Ansorg <jens ansorg-web de>
-
-- Garden.jpg:
-  Copyright  2008 Charles Barbin <barbinch free fr>
-
-- GreenMeadow.jpg:
-  Copyright  2005 Timothy Schellhase
-  Copyright  2008 Lapo Calamandrei
-
-- TwoWings.jpg: Charles Barbin <barbinch free fr>
-  Copyright  2008 Charles Barbin <barbinch free fr>
-  Copyright  2008 Hylke Bons <hylkebons gmail com>
-
 - Wood.jpg:
   Copyright  2008 Jean-FranÃois Fortin Tam <nekohayo gmail com>
-
-- YellowFlower.jpg:
-  Copyright  2008 Charles Barbin <barbinch free fr>
+  
+- Tulip.jpg:
+  Copyright  2011 Pank Seelen
+  Licensed under Creative Commons Attribution-ShareAlike 2.0 License.
diff --git a/backgrounds/Fabric.jpg b/backgrounds/Fabric.jpg
new file mode 100644
index 0000000..5e93676
Binary files /dev/null and b/backgrounds/Fabric.jpg differ
diff --git a/backgrounds/Makefile.am b/backgrounds/Makefile.am
index 8553107..8151440 100644
--- a/backgrounds/Makefile.am
+++ b/backgrounds/Makefile.am
@@ -1,27 +1,19 @@
 backgrounddir = $(datadir)/backgrounds/gnome
 
 background_DATA =\
-	Aqua.jpg \
 	Blinds.jpg \
 	BlueMarbleWest.jpg \
 	Chmiri.jpg \
+	Fabric.jpg \
 	FootFall.png \
-	FreshFlower.jpg \
-	Garden.jpg \
-	GreenMeadow.jpg \
 	Spaceflare.jpg \
-	Spaceflare-nova.jpg \
   Stamps.jpg \
 	Stripes.jpg \
 	Stripes34.jpg \
-	SundownDunes.jpg \
-	Terraform-blue.jpg \
 	Terraform-green.jpg \
-	Terraform-orange.jpg \
-	TwoWings.jpg \
+	Tulip.jpg \
 	UnderLit.jpg \
 	Wood.jpg \
-	YellowFlower.jpg \
 	ZvonecKonec.jpg
 
 metadata_in_files = gnome-backgrounds.xml.in
diff --git a/backgrounds/Tulip.jpg b/backgrounds/Tulip.jpg
new file mode 100644
index 0000000..ee668a2
Binary files /dev/null and b/backgrounds/Tulip.jpg differ
diff --git a/backgrounds/gnome-backgrounds.xml.in.in b/backgrounds/gnome-backgrounds.xml.in.in
index 276b55e..f851983 100644
--- a/backgrounds/gnome-backgrounds.xml.in.in
+++ b/backgrounds/gnome-backgrounds.xml.in.in
@@ -2,22 +2,13 @@
 <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
 <wallpapers>
 	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Aqua.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Aqua</_name>
-		<filename>@BACKGROUNDDIR@/Aqua.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Blinds.jpg - 
 		You might want to translate it into the equivalent words of your language  -->
 		<_name>Blinds</_name>
 		<filename>@BACKGROUNDDIR@/Blinds.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/BlueMarbleWest.jpg - 
@@ -25,8 +16,8 @@
 		<_name>Blue Marble</_name>
 		<filename>@BACKGROUNDDIR@/BlueMarbleWest.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Chmiri.jpg - 
@@ -34,44 +25,26 @@
 		<_name>Dandelion</_name>
 		<filename>@BACKGROUNDDIR@/Chmiri.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/FootFall.png - 
+		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Fabric.jpg - 
 		You might want to translate it into the equivalent words of your language  -->
-		<_name>Foot Fall</_name>
-		<filename>@BACKGROUNDDIR@/FootFall.png</filename>
+		<_name>Pink Fabric</_name>
+		<filename>@BACKGROUNDDIR@/Fabric.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/FreshFlower.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Fresh Flower</_name>
-		<filename>@BACKGROUNDDIR@/FreshFlower.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Garden.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Garden</_name>
-		<filename>@BACKGROUNDDIR@/Garden.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/GreenMeadow.jpg - 
+		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/FootFall.png - 
 		You might want to translate it into the equivalent words of your language  -->
-		<_name>Green Meadow</_name>
-		<filename>@BACKGROUNDDIR@/GreenMeadow.jpg</filename>
+		<_name>Foot Fall</_name>
+		<filename>@BACKGROUNDDIR@/FootFall.png</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Spaceflare.jpg - 
@@ -79,17 +52,8 @@
 		<_name>Spaceflare</_name>
 		<filename>@BACKGROUNDDIR@/Spaceflare.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Spaceflare-nova.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Spaceflare Nova</_name>
-		<filename>@BACKGROUNDDIR@/Spaceflare-nova.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Stamps.jpg - 
@@ -97,8 +61,8 @@
 		<_name>Stamps</_name>
 		<filename>@BACKGROUNDDIR@/Stamps.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Stripes.jpg - 
@@ -115,58 +79,32 @@
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/SundownDunes.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Sundown Dunes</_name>
-		<filename>@BACKGROUNDDIR@/SundownDunes.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Terraform-blue.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Terraform Blue</_name>
-		<filename>@BACKGROUNDDIR@/Terraform-blue.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Terraform-green.jpg - 
 		You might want to translate it into the equivalent words of your language  -->
 		<_name>Terraform Green</_name>
 		<filename>@BACKGROUNDDIR@/Terraform-green.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Terraform-orange.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Terraform Orange</_name>
-		<filename>@BACKGROUNDDIR@/Terraform-orange.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/TwoWings.jpg - 
+		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Tulip.jpg - 
 		You might want to translate it into the equivalent words of your language  -->
-		<_name>Two Wings</_name>
-		<filename>@BACKGROUNDDIR@/TwoWings.jpg</filename>
+		<_name>Tulip</_name>
+		<filename>@BACKGROUNDDIR@/Tulip.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
+
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/UnderLit.jpg - 
 		You might want to translate it into the equivalent words of your language  -->
 		<_name>Underlit</_name>
 		<filename>@BACKGROUNDDIR@/UnderLit.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/Wood.jpg - 
@@ -174,17 +112,8 @@
 		<_name>Wood</_name>
 		<filename>@BACKGROUNDDIR@/Wood.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
-	</wallpaper>
-	<wallpaper deleted="false">
-		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/YellowFlower.jpg - 
-		You might want to translate it into the equivalent words of your language  -->
-		<_name>Yellow Flower</_name>
-		<filename>@BACKGROUNDDIR@/YellowFlower.jpg</filename>
-		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- TRANSLATORS: This is the name of this background picture: http://git.gnome.org/browse/gnome-backgrounds/plain/backgrounds/ZvonecKonec.jpg - 
@@ -192,7 +121,7 @@
 		<_name>End Bell</_name>
 		<filename>@BACKGROUNDDIR@/ZvonecKonec.jpg</filename>
 		<options>zoom</options>
-                <pcolor>#ffffff</pcolor>
-                <scolor>#000000</scolor>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
 	</wallpaper>
 </wallpapers>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]