X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=config%2Fconfig.ini;h=9615cc9b9b76b88017198c3e976e91ebc96cff67;hb=22587fb2fe6a2e9edff2edcc0613d7fcda98977a;hp=806632dcd71873ea9c5400ed7aa25a4526125523;hpb=e2c36968e63b37c926ed903df2395f69d25577ec;p=deb%2Fhackedgotchi.git

diff --git a/config/config.ini b/config/config.ini
index 806632d..9615cc9 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -29,12 +29,15 @@ showalltext = Show all
 subscriptionstext = Subscriptions
 feedtext = feed
 otherplanettext = Planetarium
+wikitext = More info on Planet Debian is available in our
+wikiname = wiki page
 
-# Do not change config values below here, just skip to the feeds
 # Do not change config values below here, just skip to the feeds
 owner_name = Debian Planet Maintainers
 owner_email = planet@debian.org
 
+wiki_url = http://wiki.debian.org/PlanetDebian
+
 search = true
 # new_feed_items: Number of items to take from new feeds
 # log_level: One of DEBUG, INFO, WARNING, ERROR or CRITICAL
@@ -98,7 +101,7 @@ faceheight = 99
 
 # Away for VAC.
 # [http://chistera.yi.org/~adeodato/blog/planetd.rss]
-# name = Adeodato Sim?
+# name = Adeodato Simó
 
 # Added 2009-08-21 by jimmy
 # dc9/dc10 attendee and volunteer/orga person, and dc11 bosnian bid team leader
@@ -391,7 +394,7 @@ name = Carlos Villegas
 # from the extremadura people
 # 2008-12-13 - joerg - 404
 #[http://cek.bitacoras.com/archivos/category/english/feed/]
-#name = C?sar G?mez Mart?n
+#name = César Gómez Martín
 
 [http://debian.nullcode.org/b/index.rss]
 name = Chris Anderson
@@ -481,17 +484,18 @@ name = Craig Sanders
 [http://www.enc.com.au/sees-blog/atom.xml]
 name = Craig Small
 
-[http://ikibiki.org/tags/debian/index.rss]
+[http://blog.ikibiki.org/tags/debian/index.rss]
 name = Cyril Brulebois
 
 [http://www.livejournal.com/users/mirrorlynx/data/rss]
 name = Dan Weber
 
-[http://blog.daniel-baumann.ch/planet-debian-aggregator/index.rss]
-name = Daniel Baumann
-face = daniel.png
-facewidth = 94
-faceheight = 102
+# temporarily disabled on 2010-10-31 due server move
+#[http://blog.daniel-baumann.ch/planet-debian-aggregator/index.rss]
+#name = Daniel Baumann
+#face = daniel.png
+#facewidth = 94
+#faceheight = 102
 
 [http://algebraicthunk.net/~dburrows/blog/index.rss]
 name = Daniel Burrows
@@ -680,18 +684,12 @@ faceheight = 91
 [http://warmenhoven.org/blog/feed/]
 name = Eric Warmenhoven
 
-[http://blog.drinsama.de/erich/en/index.rss]
+[http://www.vitavonni.de/blog/feeds/en.atom]
 name = Erich Schubert
 face = erich.png
 facewidth = 76
 faceheight = 100
 
-[http://erinn.org/itis/lieutenant/index.rss]
-name = Erinn Clark
-face = erinn.png
-facewidth = 70
-faceheight = 81
-
 # Added by Enrico Zini, currently in NM queue
 [http://jackyf.livejournal.com/data/rss?tag=debian-en]
 name = Eugene V. Lyubimkin
@@ -783,7 +781,7 @@ name = Frans Pop
 #facewidth = 65
 #faceheight = 85
 
-[http://rhonda.deb.at/blog/index.rss]
+[http://rhonda.deb.at/blog/index.planet]
 name = Gerfried Fuchs
 face = rhonda.png
 facewidth  = 89
@@ -913,6 +911,9 @@ faceheight = 102
 [http://phython.blogspot.com/atom.xml]
 name = 	James Morrison
 
+[http://www.debian-administration.org/weblog/feeds/drgraefy]
+name = 	Jameson Rollins
+
 [http://current.workingdirectory.net/tags/debian/index.rss]
 name = Jamie McClelland
 
@@ -925,8 +926,11 @@ faceheight = 85
 [http://sicherheitsschwankung.de/topic/linux/debian/feed]
 name = Jan Lübbe
 
-[http://jhr-online.de/tag/debian/feed]
+[http://blog.jhr-online.de/tag/debian/feed]
 name = Jan Hauke Rahm
+face = jhr.png
+facewidth = 70
+faceheight = 97
 
 [http://blog.waja.info/index.php?tag=planet&feed=rss2]
 name = Jan Wagner
@@ -953,7 +957,7 @@ name = Jeff Licquia
 name = Jelmer Vernooij
 
 [http://jeremie.famille-corbier.net/blog.atom]
-name = J?r?mie Corbier
+name = Jérémie Corbier
 
 [http://jeroen.wolffelaar.nl/blog/debian.rss]
 name = Jeroen van Wolffelaar
@@ -1068,7 +1072,7 @@ faceheight = 95
 facewidth = 66
 
 [http://blog.bureado.com.ve/?feed=rss2&cat=12]
-name = Jos? Parrella
+name = José Parrella
 face = bureado.png
 facewidth = 80
 faceheight = 98
@@ -1101,6 +1105,9 @@ faceheight = 84
 [http://www.kirya.net/weblog/tag/planet-debian/feed/]
 name = Julien Valroff
 
+[http://silicone.homelinux.org/tag/debian-planet/feed/]
+name = Julien Viard de Galbert
+
 [http://www.netfort.gr.jp/~dancer/diary/recententry-en.rdf]
 name = Junichi Uekawa
 face = dancer.png
@@ -1173,9 +1180,8 @@ face = costela.png
 faceheight = 105
 facewidth = 72
 
-# 2008-04-24 liw commented out himself
-#[http://blog.liw.fi/tag/planet-debian/index.atom]
-#name = Lars Wirzenius
+[http://blog.liw.fi/englishfeed/index.atom]
+name = Lars Wirzenius
 
 # 2007-07-22 mako
 # commented out lior's blog to test
@@ -1197,8 +1203,8 @@ faceheight = 95
 [http://dktrkranz.wordpress.com/category/planet-debian/feed/atom/]
 name = Luca Falavigna
 face = dktrkranz.png
-facewidth = 70
-faceheight = 95
+facewidth = 65
+faceheight = 85
 
 [http://slackydeb.blogspot.com/feeds/posts/default/-/gsoc]
 name = Luca Favatella
@@ -1528,7 +1534,7 @@ facewidth = 85
 faceheight = 113
 
 [http://nvalcarcel.aureal.com.pe/?cat=189&feed=rss2]
-name = Nicolas Valc?rcel
+name = Nicolas Valcárcel
 face = nxvl.png
 facewidth = 85
 faceheight = 113
@@ -1649,6 +1655,9 @@ name = Pierre Machard
 face = machard.png
 faceheight = 84
 
+[http://mancoosi.org/~abate/taxonomy/term/8/0/feed]
+name = Pietro Abate
+
 [http://piotr.galiszewski.pl/feeds/posts/default/-/planet-debian]
 name = Piotr Galiszewski
 
@@ -1756,12 +1765,6 @@ face = rudy.png
 facewidth = 65
 faceheight = 61
 
-[http://www.indentedlines.net/feed/atom/]
-name = Runa Sandvik
-face = runa.png
-facewidth = 70
-faceheight = 92
-
 [http://www.eyrie.org/~eagle/journal/debian.rss]
 name = Russ Allbery
 
@@ -1839,6 +1842,9 @@ name = Siegfried Gevatter
 [http://www.earth.li/~huggie/blog/tech/debian/planet/index.atom]
 name = Simon Huggins
 
+[http://blog.josefsson.org/feed/]
+name = Simon Josefsson
+
 [http://sfllaw.livejournal.com/data/rss?tag=p.d.o]
 name = Simon Law
 face = slaw.png
@@ -1909,7 +1915,7 @@ face = sven.png
 facewidth = 75
 faceheight = 95
 
-[http://le-gall.net/sylvain+violaine/blog/rss.php]
+[http://le-gall.net/sylvain+violaine/blog/index.php?feed/atom]
 name = Sylvain Le Gall
 face = gildor.png
 facewidth = 65
@@ -1930,11 +1936,11 @@ name = Theppitak Karoonboonyanan
 [http://gsoc.sitedethib.com/index.rss]
 name = Thibaut Girka
 
-#[http://loeki.tv/log/feeds/index.rss2]
-#name = Thijs Kinkhorst
-#face = thijs.png
-#facewidth = 65
-#faceheight = 67
+[http://loeki.tv/log/feeds/index.rss2]
+name = Thijs Kinkhorst
+face = thijs.png
+facewidth = 65
+faceheight = 67
 
 [http://haecceity.clearairturbulence.org/xml/atom/category/tech/feed.xml]
 name = Thom May
@@ -2028,9 +2034,14 @@ face = corsac-planet.png
 facewidth = 80
 faceheight = 81
 
-[http://blog.zakame.net/rss]
+[http://blog.zakame.net/tags/debian/rss]
 name = Zak B. Elep
 face = zakame.png
 facewidth = 86
 faceheight = 108
 
+[http://www.piware.de/category/debian/feed/atom/]
+name = Martin Pitt
+face = pitti.png
+facewidth = 74
+faceheight = 98