From adbbb6234ceb1af7eb3bbb9c1fd4bc786ee9e3da Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 26 Oct 2010 19:47:28 +0200
Subject: Revert aggregation l10n. Try avoid inline on aggregation page to
 avoid loop.

---
 activities.da.po | 43 +++++++------------------------------------
 activities.mdwn  | 16 +++-------------
 2 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/activities.da.po b/activities.da.po
index 5c015c9..7ea6e79 100644
--- a/activities.da.po
+++ b/activities.da.po
@@ -26,40 +26,6 @@ msgstr "Aktiviteter"
 msgid "Tweets"
 msgstr "Kvidren"
 
-#. type: Plain text
-msgid "Latest micro-blogging entries:"
-msgstr "Seneste mikro-blogningsindlæg"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"internal(feeds/identi.ca/en/*)\" archive=yes show=\"10\" "
-"template=titlepage]]\n"
-msgstr ""
-"[[!inline pages=\"internal(feeds/identi.ca/da/*)\" archive=yes show=\"10\" "
-"template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Music"
-msgstr "Musik"
-
-#. type: Plain text
-msgid "Latest played music:"
-msgstr "Senest afspillet musik:"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!inline pages=\"internal(feeds/last.fm/en/*)\" archive=yes "
-"show=\"10\" template=titlepage]]\n"
-msgstr "[[!inline pages=\"internal(feeds/last.fm/da/*)\" archive=yes "
-"show=\"10\" template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Sources"
-msgstr "Kilder"
-
 #. type: Plain text
 #, no-wrap
 msgid ""
@@ -71,13 +37,18 @@ msgstr ""
 "feedurl=\"http://identi.ca/jonass/tag/da/rss\"\n"
 "url=\"http://identi.ca/jonass/tags/da\" updateinterval=\"1\"]]\n"
 
+#. type: Title ##
+#, no-wrap
+msgid "Music"
+msgstr "Musik"
+
 #. type: Plain text
 #, no-wrap
 msgid ""
-"[[!aggregate  name=\"lastfm_en\" dir=\"feeds/last.fm/en\"\n"
+"[[!aggregate  name=\"lastfm\" dir=\"feeds/last.fm/C\"\n"
 "feedurl=\"http://ws.audioscrobbler.com/1.0/user/JonasSmedegaard/recenttracks.rss\"\n"
 "url=\"http://www.last.fm/user/JonasSmedegaard\" updateinterval=\"1\"]]\n"
 msgstr ""
-"[[!aggregate  name=\"lastfm_da\" dir=\"feeds/last.fm/da\"\n"
+"[[!aggregate  name=\"lastfm\" dir=\"feeds/last.fm/C\"\n"
 "feedurl=\"http://ws.audioscrobbler.com/1.0/user/JonasSmedegaard/recenttracks.rss\"\n"
 "url=\"http://www.last.fm/user/JonasSmedegaard\" updateinterval=\"1\"]]\n"
diff --git a/activities.mdwn b/activities.mdwn
index 21d7d0d..e2e4502 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -2,22 +2,12 @@
 
 ## Tweets
 
-Latest micro-blogging entries:
-
-[[!inline pages="internal(feeds/identi.ca/en/*)" archive=yes show="10" template=titlepage]]
-
-## Music
-
-Latest played music:
-
-[[!inline pages="internal(feeds/last.fm/en/*)" archive=yes show="10" template=titlepage]]
-
-## Sources
-
 [[!aggregate  name="identica_en" dir="feeds/identi.ca/en"
 feedurl="http://identi.ca/jonass/tag/en/rss"
 url="http://identi.ca/jonass/tags/en" updateinterval="1"]]
 
-[[!aggregate  name="lastfm_en" dir="feeds/last.fm/en"
+## Music
+
+[[!aggregate  name="lastfm" dir="feeds/last.fm/C"
 feedurl="http://ws.audioscrobbler.com/1.0/user/JonasSmedegaard/recenttracks.rss"
 url="http://www.last.fm/user/JonasSmedegaard" updateinterval="1"]]
-- 
cgit v1.2.3