muck-services 0.1.25 → 0.1.26

data/VERSION

@@ -1 +1 @@
-0.1.25
+0.1.26

data/app/controllers/muck/identity_feeds_controller.rb

@@ -28,19 +28,25 @@ class Muck::IdentityFeedsController < ApplicationController
   
   def create
     @service = Service.find(params[:service_id])
-    @feed = Feed.new(:uri => params[:uri], :login => params[:username])
-    feeds = Service.create_tag_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
-    if feeds.blank?
-      success = false
-      if params[:username]
-        message = I18n.t('muck.services.no_feeds_from_username')
+    if !params[:uri].blank?
+      @feed = Feed.new(:uri => params[:uri], :login => params[:username])
+      feeds = Service.create_tag_feeds_for_service(@service, params[:uri], params[:username], params[:password], current_user.id)
+      if feeds.blank?
+        success = false
+        if params[:username]
+          message = I18n.t('muck.services.no_feeds_from_username')
+        else
+          message = I18n.t('muck.services.no_feeds_at_uri')
+        end
       else
-        message = I18n.t('muck.services.no_feeds_at_uri')
+        success, messages = add_feeds_to_parent(@parent, feeds)
+        message = messages.join('<br />')
       end
     else
-      success, messages = add_feeds_to_parent(@parent, feeds)
-      message = messages.join('<br />')
+      success = false
+      message = I18n.t('muck.services.please_specify_url')
     end
+    
     respond_to do |format|
       format.html do
         flash[:notice] = message if message

data/locales/ar.yml

@@ -82,6 +82,7 @@ ar:
       failed_last_request: "فشل الطلب الأخير : {{error}}"
       feed: تغذية
       feed_banned_message: "تغذية كانت محظورة."
+      feed_display_address: "رابط الخلاصة"
       feed_id: معرف
       feed_metadata_address: "الفوقية العنوان"
       feed_remove: "تغذية إزالتها"
@@ -151,6 +152,7 @@ ar:
       opml_generated: "ليغذي {{terms}}"
       personal_recommendations: التوصيات
       photos: صور
+      please_specify_url: "يرجى تحديد رابط"
       polyvore_prompt: "Polyvore ملف رابط"
       polyvore_rss: "Polyvore بك لمحة رابط يشبه http://www.polyvore.com/cgi/profile؟id=00000"
       powered_by: "مدعوم من"
@@ -180,6 +182,7 @@ ar:
       search_button: يذهب
       search_for: "البحث عن :"
       search_link: "العثور على موارد!"
+      search_problem: "كانت هناك مشكلة مع البحث. يرجى مراجعة معايير البحث الخاصة بك وحاول مرة أخرى."
       searching_for_feed: "البحث عن يغذي..."
       select_feeds_prompt: "حدد يغذي كنت أود أن أضيف :"
       select_service_prompt: "يرجى اختيار خدمة"

data/locales/bg.yml

@@ -82,6 +82,7 @@ bg:
       failed_last_request: "Неуспешно последната заявка: {{error}}"
       feed: Храня
       feed_banned_message: "Фуражът е забранена."
+      feed_display_address: "Feed URL"
       feed_id: ID
       feed_metadata_address: "Метаданните Адрес"
       feed_remove: "Премахнато Feed"
@@ -151,6 +152,7 @@ bg:
       opml_generated: "Feeds за {{terms}}"
       personal_recommendations: Препоръчваме
       photos: Снимки
+      please_specify_url: "Моля, посочете URL"
       polyvore_prompt: "Polyvore профил URL"
       polyvore_rss: "Вашият профил Polyvore URL прилича http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "захранва от"
@@ -180,6 +182,7 @@ bg:
       search_button: Отивам
       search_for: "Търсене за:"
       search_link: "Намери ресурси!"
+      search_problem: "Имаше проблем с вашето търсене. Моля, прегледайте критериите за търсене и опитайте отново."
       searching_for_feed: "Търсене на емисии ..."
       select_feeds_prompt: "Изберете емисии, който искате да добавите:"
       select_service_prompt: "Моля изберете услуга"

data/locales/ca.yml

@@ -82,6 +82,7 @@ ca:
       failed_last_request: "No es pot darrera petició: {{error}}"
       feed: Alimentar
       feed_banned_message: "Aliment va ser prohibit."
+      feed_display_address: "URL del canal"
       feed_id: ID
       feed_metadata_address: "Direcció de metadades"
       feed_remove: "Feed eliminats"
@@ -151,6 +152,7 @@ ca:
       opml_generated: "Feeds per {{terms}}"
       personal_recommendations: Recomanacions
       photos: Fotos
+      please_specify_url: "Si us plau, introduïu un URL"
       polyvore_prompt: "Polyvore URL"
       polyvore_rss: "El seu perfil Polyvore URL sembla http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "powered by"
@@ -180,6 +182,7 @@ ca:
       search_button: Anar
       search_for: "Cerca:"
       search_link: "Trobar recursos!"
+      search_problem: "Hi va haver un problema amb la cerca. Si us plau, revisi els seus criteris de cerca i torna a intentar-ho."
       searching_for_feed: "La recerca de feeds ..."
       select_feeds_prompt: "Seleccioneu les notícies que voleu afegir:"
       select_service_prompt: "Si us plau, seleccioneu un servei"
@@ -211,4 +214,4 @@ ca:
       visit: visita
       xml: XML
       zotero_group_prompt: "Grup Zotero URL"
-      zotero_group_rss: "El seu grup Zotero URL és així: http://www.zotero.org/groups/adventures_in_library_instruction/items"
+      zotero_group_rss: "Seva grup Zotero URL és així: http://www.zotero.org/groups/adventures_in_library_instruction/items"

data/locales/cs.yml

@@ -82,6 +82,7 @@ cs:
       failed_last_request: "Neúspěšný poslední dotaz: {{error}}"
       feed: Krmit
       feed_banned_message: "Krmivo byl zakázán."
+      feed_display_address: "Feed URL"
       feed_id: ID
       feed_metadata_address: "Metadata Adresa"
       feed_remove: "Feed Removed"
@@ -151,6 +152,7 @@ cs:
       opml_generated: "Krmiva pro {{terms}}"
       personal_recommendations: Doporučení
       photos: Fotografie
+      please_specify_url: "Prosím, zadejte adresu URL"
       polyvore_prompt: "Polyvore profil URL"
       polyvore_rss: "Vaše Polyvore profil URL vypadá http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "powered by"
@@ -180,6 +182,7 @@ cs:
       search_button: Jít
       search_for: "Hledat:"
       search_link: "Najít zdroje!"
+      search_problem: "Došlo k problému s výsledky vašeho hledání. Projděte si prosím kritéria vyhledávání a zkuste to znovu."
       searching_for_feed: "Vyhledávání kanálů ..."
       select_feeds_prompt: "Vyberte kanály, který chcete přidat:"
       select_service_prompt: "Prosím vyberte službu"

data/locales/da.yml

@@ -28,7 +28,7 @@ da:
       all_resources: "Alle ressourcer"
       already_added_uri_feed: "Du har allerede tilføjet den url {{uri}}"
       already_added_username_feed: "Du har allerede tilføjet en {{service}} konto med brugernavnet {{username}}"
-      already_shared: "Du tidligere har delt denne side."
+      already_shared: "Du har tidligere delte denne side."
       amazon_prompt: "Indtast den e-mail, du bruger med Amazon.com"
       approval_status: Godkendt
       atom: Atom
@@ -82,6 +82,7 @@ da:
       failed_last_request: "Mislykket sidste anmodning: {{error}}"
       feed: Fodre
       feed_banned_message: "Feed blev forbudt."
+      feed_display_address: "Feed URL"
       feed_id: ID
       feed_metadata_address: "Metadata Adresse"
       feed_remove: "Feed Fjernet"
@@ -121,7 +122,7 @@ da:
       login_to_comment: "Log ind for at tilføje en kommentar"
       metadata: metadata
       metadata_prefix: "Metadata Præfiks"
-      my_identity: "Min identitet"
+      my_identity: "Min Identity"
       my_services: "Min Service"
       narrow_further: "indsnævre resultaterne yderligere"
       netflix_prompt: "Netflix Kø RSS URL"
@@ -151,6 +152,7 @@ da:
       opml_generated: "Feeds til {{terms}}"
       personal_recommendations: Anbefalinger
       photos: Billeder
+      please_specify_url: "Angiv en URL"
       polyvore_prompt: "Polyvore profil URL"
       polyvore_rss: "Din Polyvore profil URL udseende http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "powered by"
@@ -180,6 +182,7 @@ da:
       search_button: Start
       search_for: "Søg efter:"
       search_link: "Find ressourcer!"
+      search_problem: "Der var et problem med din søgning. Gennemgå venligst dine søgekriterier, og prøv igen."
       searching_for_feed: "Søger efter feeds ..."
       select_feeds_prompt: "Vælg de feeds, du ønsker at tilføje:"
       select_service_prompt: "Vælg en tjeneste"

data/locales/de.yml

@@ -82,6 +82,7 @@ de:
       failed_last_request: "Failed letzte Bitte: {{error}}"
       feed: Füttern
       feed_banned_message: "Feed wurde verboten."
+      feed_display_address: Feed-URL
       feed_id: ID
       feed_metadata_address: Metadaten-Adresse
       feed_remove: "Feed entfernt"
@@ -151,6 +152,7 @@ de:
       opml_generated: "Feeds für {{terms}}"
       personal_recommendations: Empfehlungen
       photos: Fotos
+      please_specify_url: "Bitte geben Sie eine URL"
       polyvore_prompt: "Polyvore Profil URL"
       polyvore_rss: "Ihr Profil Polyvore URL aussieht http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "powered by"
@@ -180,6 +182,7 @@ de:
       search_button: Gehen
       search_for: "Suchen nach:"
       search_link: "Finden Sie Resources!"
+      search_problem: "Es gab ein Problem mit Ihrer Suche. Bitte überprüfen Sie Ihre Suchkriterien und versuchen Sie es erneut."
       searching_for_feed: "Auf der Suche nach RSS-Feeds ..."
       select_feeds_prompt: "Wählen Sie die Feeds, die Sie möchte hinzufügen:"
       select_service_prompt: "Bitte wählen Sie einen Dienst"

data/locales/el.yml

@@ -82,6 +82,7 @@ el:
       failed_last_request: "Failed τελευταίο αίτημα: {{error}}"
       feed: Τροφοδοσία
       feed_banned_message: "Ζωοτροφές απαγορεύτηκε."
+      feed_display_address: "Feed URL"
       feed_id: ID
       feed_metadata_address: "Μεταδεδομένα Διεύθυνση"
       feed_remove: "Feed Removed"
@@ -151,6 +152,7 @@ el:
       opml_generated: "Ροές για {{terms}}"
       personal_recommendations: Συστάσεις
       photos: Φωτογραφίες
+      please_specify_url: "Προσδιορίστε ένα URL"
       polyvore_prompt: "Polyvore προφίλ URL"
       polyvore_rss: "Polyvore προφίλ σας URL μοιάζει http://www.polyvore.com/cgi/profile?id=00000"
       powered_by: "powered by"
@@ -180,6 +182,7 @@ el:
       search_button: Πάω
       search_for: "Αναζήτηση για:"
       search_link: "Βρείτε Πόρων!"
+      search_problem: "Υπήρξε ένα πρόβλημα με την αναζήτησή σας. Παρακαλώ εξετάστε τα κριτήρια αναζήτησης σας και προσπαθήστε ξανά."
       searching_for_feed: "Ψάχνοντας για ροές δεδομένων ..."
       select_feeds_prompt: "Επιλέξτε τις τροφές που θα θέλατε να προσθέσετε:"
       select_service_prompt: "Παρακαλώ επιλέξτε μια υπηρεσία"

data/locales/en.yml

@@ -1,219 +1,217 @@
-en:
-  muck:
-    activity_templates:
-      entry_comment: Comment
-    services:
-      add_new_feed_title: "Add a new feed"
-      no_tags: "No tags available yet"
+--- 
+en: 
+  muck: 
+    services: 
+      get_recommendations: Get Recommendations
+      generate_new_topic: Generate a new topic
+      feed_display_address: Feed Url
+      facebook_notifications: Facebook Notifications
+      type_of_metadata: "Type of Metadata:"
+      facebook_prompt: Your Facebook My Links URL
+      add_feed_url: "Url:"
+      no_terms_error: Please specify a term or list of terms.
+      already_added_uri_feed: You've already added the url {{uri}}
+      login_to_comment: Login to add a comment
+      previous_label: Previous
+      feeds_title: Registered Collections
+      resources_tag_cloud_label: browse resources using tags <a href="/resources?grain_size=course">[browse only courses]</a>
+      add_rss_feed: Add RSS Feed
+      photos: Photos
+      friendfeed_prompt: FriendFeed RSS URL
+      display_address: Display Address
+      search: search
       collections: Collections
-      demo: Demo
+      comment_entries_count: 
+        one: 1 Comment
+        other: "{{count}} Comments"
+      narrow_further: narrow results further
+      search_link: Find Resources!
       search_button: Go
-      collections_long: "Indexed Collections"
-      developers_long: "Information for Developers"
-      powered_by: "powered by"
-      no_hits: "Your search - <b>{{search}}</b> - did not match any <b>{{resource_type}}</b>. Please try a different search or choose a different language."
-      no_tagged_courses: "No <b>courses</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/{{tags}}'>all resources tagged {{tags}}</a>."
-      no_tagged_resources: "No <b>resources</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a>."
-      no_recommendations: "No recommendations were found."
-      my_identity: My Identity
-      previous: Previous
-      next: Next
-      results: Results
-      of: of
-      for: for
-      relevance: relevance
-      metadata: metadata
-      related_resources: related
-      rss: RSS
+      edit_aggregation: Edit Aggregation
+      linkedin_prompt: LinkedIn public profile URL
+      rss_url: Url for your rss feed
       xml: XML
-      personal_recommendations: Recommendations
-      atom: Atom 
-      rdf: RDF 
-      related_resources_title: Related Resources
-      calculated: calculated
+      select_feeds_prompt: "Select the feeds you would like to add:"
+      no_feeds_at_uri: We could not find the given url
+      blogger_prompt: Url of your Blog
       details: Details
-      gm_title: Related Resources
-      gm_more_prompt: More Related Resources
-      show_related_resources: Show Related Resources
-      direct_link: '[direct link]'
-      search: search
-      search_link: Find Resources!
-      resources_tag_cloud_label: browse resources using tags <a href="/resources?grain_size=course">[browse only courses]</a>
-      courses_tag_cloud_label: browse courses using tags <a href="/resources">[browse all resources]</a>
-      narrow_further: narrow results further
-      show_tagged_courses: show only courses 
-      show_tagged_resources: show any kind of resource
+      related_resources_title: Related Resources
+      successfully_added_username_feed: Successfully added {{service}}
+      collection_description: "Collection Description:"
+      feed: Feed
+      add_oai: Add OAI
+      setup_aggregation: Setup Aggregation
       tags: tags
+      add_feed_advanced: Add Feed (Advanced)
+      uri: Url
+      cant_modify_identity_feed: You don't have permission to access the specified feed.
+      remove: Remove
+      developers_long: Information for Developers
+      rss: RSS
+      validate_feed: Mark feed as valid
+      discover_feed_message: Searching for information about the url you provided.  Please wait.
+      service_feed_name: "{{term}} on {{service}}"
+      please_specify_url: Please specify a url
+      available_sources: Available Sources
+      import_service: Import {{service}}
+      new_search: New Search
+      no_tags: No tags available yet
+      generating_topic_message: Searching.  This might take a minute or so....
       start_over: start over
-      course_tag_results: "Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
-      resource_tag_results: "Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"  
-      course_search_results: "Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
-      resource_search_results: "Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
-      next_label: Next
-      previous_label: Previous
-      all_resources: All Resources
+      add_aggregation_title: "Name for aggregation:"
+      back: Back
+      polyvore_prompt: Polyvore profile URL
+      login_or_signup_prompt: "{{signup}} or {{login}} to discuss and share resources."
+      facebook_shares: Facebook Shared Links
+      for: for
+      zotero_group_prompt: Zotero group URL
+      download_opml: Download OPML file for {{terms}}
+      loading_content_image: <%= t('muck.services.loading_image') %>
+      save_aggreation: Save this Aggregation
+      metadata: metadata
+      signup_to_save_aggreation: "{{login}} or {{signup}} to save this search"
+      visit: visit
+      facebook_link: You can find your URL on your Facebook My Links page. {{link}} and then click on 'My Links'
+      course_search_results: Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>
       only_courses: Only Courses
-      add_feed: Add
-      feed_display_address: 'Feed Url'
-      add_feed_url: "Url:"
-      discover_feed_message: "Searching for information about the url you provided.  Please wait."
-      select_feeds_prompt: "Select the feeds you would like to add:"
-      display_url: "Url to be displayed:"
-      title: "Title"
-      short_title: "Short title:"
-      description: "Description:"
-      add_feed_title: "Add a new feed"
-      repository_title: "Repository Title:"
-      repository_short_title: "Repository Short Title:"
-      repository: "Metadata"
+      no_hits: Your search - <b>{{search}}</b> - did not match any <b>{{resource_type}}</b>. Please try a different search or choose a different language.
+      no_recommendations: No recommendations were found.
+      feed_successfully_created: Feed was successfully created.
+      login: Login
+      next_label: Next
+      add_rss: Add Rss
+      already_added_username_feed: You've already added a {{service}} account with the username {{username}}
+      topic_feeds_for: Feeds for {{terms}}
+      explore: Search for {{topic}}
+      videos: Videos
+      terms_instructions: Add as many tags or phrases as you'd like.  Separate each with a comma.  ie food, recipes, best places to eat, organic
+      failed_harvests: Failed harvests
+      add_oai_feed: Add OAI Endpoint
+      new_topic_title: Search for a new topic and build the results page.
+      aggregation_deleted: "{{title}} deleted"
+      collection_home_uri: Address of the Collection Home Page
+      problem_adding_feed: "There was a problem adding the feed:"
+      opml_feeds_for: Feeds for {{terms}}
+      add_aggregation: Add Aggregation
+      repository: Metadata
+      loading_message: "Loading... "
+      feed_successfully_updated: Feed was successfully updated.
+      approval_status: Approved
+      course_tag_results: Courses <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>
+      goodreads_prompt: Goodreads profile URL
+      feed_remove: Feed Removed
+      loading_image: Loading Image
+      feed_type: Feed Type
+      new_aggregation: New Aggregation
+      banned: banned
+      feeds_for_aggregation: Feeds for this aggregation
+      status: Status
+      add_extended_feed_sub_title: Contribute a new data source
+      related_resources: related
+      hide: Hide
+      latest_aggregations: Latest aggregations
+      calculated: calculated
+      demo: Demo
+      discover_feed: Discover Feed
+      no_entries_found: No entries found
+      relevance: relevance
+      read_more: read more
+      show_tagged_resources: show any kind of resource
+      contributor: Contributor
+      cant_modify_aggregation: You don't have permission to access the specified aggregation.
+      oai_endpoint_successfully_created: Successfully added OAI endpoint
+      add_extended_feed_title: Add new feed
+      gm_title: Related Resources
+      resource_tag_results: Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>
+      rdf: RDF
+      amazon_prompt: Please enter the email you use with Amazon.com
+      edit_aggregation_title: Editing {{title}}
+      remix: Remix
+      share: Share
+      my_services: My Services
+      spinner_image: Waiting image
+      language_not_supported: The requested language is not supported
       collection_uri: "Address of the Collection Metadata:"
-      collection_home_uri: "Address of the Collection Home Page"
-      collection_description: "Collection Description:"
-      type_of_metadata: "Type of Metadata:"
-      oai_prompt: "If you specify OAI, you must specify the full url to the ListRecords request (not just the OAI endpoint)"
+      feed_type_prompt: RSS is the most common feed type.  Only select OAI if you know the repository supports it and you have specified the OAI endpoint.
+      entry_commment_contents: commented on {{resource}}
+      entries_count: Entries
+      oai_prompt: If you specify OAI, you must specify the full url to the ListRecords request (not just the OAI endpoint)
+      add_new_feed_title: Add a new feed
+      repository_title: "Repository Title:"
+      new_global_feed: A new feed has been added to {{application_name}}
+      add_sources_by_tag: Add more feeds by tags.
+      no_tagged_resources: No <b>resources</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a>.
+      results: Results
+      all_resources: All Resources
+      linkedin_rss: You can find your URL at the bottom of your {{link}}.
+      facebook_instructions: On the My Links page, right-click on 'My Links' and copy the link. We will automatically include, status, links and notes.
+      search_for: "Search for:"
       choose_service: "Choose service:"
-      select_service_prompt: "Please select a service"
-      add_extended_feed_title: "Add new feed"
-      add_extended_feed_sub_title: "Contribute a new data source"
-      feed_type: "Feed Type"
-      display_address: "Display Address"
-      feed_type_prompt: "RSS is the most common feed type.  Only select OAI if you know the repository supports it and you have specified the OAI endpoint."
-      submitting_feed_message: "Submitting your feed..."
-      feed_successfully_created: "Feed was successfully created."
-      feed_successfully_updated: "Feed was successfully updated."
-      new_global_feed: "A new feed has been added to {{application_name}}"
-      feeds_title: "Registered Collections"
-      title: "Title"
-      description: "Description"
-      harvest_interval: "Harvest interval (hrs)"
-      harvested_at: "Harvested"
-      approval_status: "Approved"
-      failed_harvests: "Failed harvests"
-      status: "Status"
-      uri: "Url"
-      discover_feed: "Discover Feed"
-      add_feed: "Add Feed"
-      add_feed_advanced: "Add Feed (Advanced)"
-      metadata_prefix: "Metadata Prefix"
-      add_rss: "Add Rss"
-      add_oai: "Add OAI"
-      add_rss_feed: "Add RSS Feed"
-      add_oai_feed: "Add OAI Endpoint"
-      oai_endpoint_successfully_created: "Successfully added OAI endpoint"
-      ok: OK
-      banned: banned
-      failed_last_request: "Failed last request: {{error}}"
-      visit: "visit"
-      problem_adding_feed: "There was a problem adding the feed:"
-      validate_feed: "Mark feed as valid"
-      ban_feed: "Mark feed as invalid"
-      feed_validated_message: "Feed was approved."
-      feed_banned_message: "Feed was banned."
-      default_language: "Language"
-      entries_count: "Entries"
-      added_date: "Added"
-      feed_id: "ID"
-      feed: "Feed"
-      feed_metadata_address: "Metadata Address"
-      contributor: "Contributor"
-      close: "Close"
-      share: "Share"
-      hide: "Hide"
-      remix: "Remix"
-      login_to_comment: "Login to add a comment"
-      login_or_signup_prompt: "{{signup}} or {{login}} to discuss and share resources."
-      login: "Login"
-      signup: "Sign Up"
-      already_shared: "You've previously shared this page."
-      entry_commment_contents: "commented on {{resource}}"
-      cant_modify_identity_feed: "You don't have permission to access the specified feed."
-      available_services: "Available Services"
-      my_services: "My Services"
-      import_service: "Import {{service}}"
+      ban_feed: Mark feed as invalid
+      courses_tag_cloud_label: browse courses using tags <a href="/resources">[browse all resources]</a>
+      of: of
+      no_feeds_from_username: We could not find the given account
+      my_identity: My Identity
+      metadata_prefix: Metadata Prefix
+      short_title: "Short title:"
+      close: Close
+      atom: Atom
+      available_services: Available Services
+      friendfeed_rss: You can find your URL at the bottom of your {{link}}.
+      add_feeds_to_aggregation: Add feeds to {{title}}
+      add_opml_to_aggregation: Add OPML file
+      feed_metadata_address: Metadata Address
+      add_feed_title: Add a new feed
+      next: Next
+      gm_more_prompt: More Related Resources
+      signup: Sign Up
       service_username: "{{service}} username"
-      no_feeds_from_username: "We could not find the given account"
-      no_feeds_at_uri: "We could not find the given url"
-      successfully_added_username_feed: "Successfully added {{service}}"
-      successfully_added_uri_feed: "Successfully added {{uri}}"
-      already_added_username_feed: "You've already added a {{service}} account with the username {{username}}"
-      already_added_uri_feed: "You've already added the url {{uri}}"
-      rss_url: "Url for your rss feed"
-      blogger_prompt: "Url of your Blog"
-      netflix_prompt: "Netflix Queue RSS URL"
-      netflix_rss: "You can find your URL on your {{link}}.  Note that there are several feeds available on your Netflix Queue page (Queue, Recommendations, Movie Reviews, etc).  Add as many as you like!"
-      friendfeed_prompt: "FriendFeed RSS URL"
-      friendfeed_rss: "You can find your URL at the bottom of your {{link}}."
-      linkedin_prompt: "LinkedIn public profile URL"
-      linkedin_rss: "You can find your URL at the bottom of your {{link}}."
-      polyvore_prompt: "Polyvore profile URL"
-      polyvore_rss: "Your Polyvore profile URL looks like http://www.polyvore.com/cgi/profile?id=00000"
-      goodreads_prompt: "Goodreads profile URL"
-      goodreads_rss: "e.g., http://www.goodreads.com/user/show/1111"
-      zotero_group_prompt: "Zotero group URL"
+      netflix_prompt: Netflix Queue RSS URL
+      goodreads_rss: e.g., http://www.goodreads.com/user/show/1111
       zotero_group_rss: "Your Zotero group URL looks like: http://www.zotero.org/groups/adventures_in_library_instruction/items"
-      amazon_prompt: "Please enter the email you use with Amazon.com"
-      facebook_prompt: "Your Facebook My Links URL"
-      facebook_link: "You can find your URL on your Facebook My Links page. {{link}} and then click on 'My Links'"
-      facebook_instructions: "On the My Links page, right-click on 'My Links' and copy the link. We will automatically include, status, links and notes."
-      identity_feed_removed: "Removed service"
-      loading_content_image: "<%= t('muck.services.loading_image') %>"
-      loading_message: "Loading... "
-      loading_image: "Loading Image"
-      spinner_image: "Waiting image"
-      identity_feeds: "Identity Feeds"
-      facebook_notifications: "Facebook Notifications"
-      facebook_shares: "Facebook Shared Links"
-      facebook_notes: "Facebook Notes"
-      add_edit_feeds: "Add/Edit Feeds"
-      available_sources: "Available Sources"
-      setup_aggregation: "Setup Aggregation"
-      new_aggregation: "New Aggregation"
-      feeds_for_aggregation: "Feeds for this aggregation"
-      add_feeds_to_aggregation: "Add feeds to {{title}}"
-      edit_aggregation_title: "Editing {{title}}"
-      cant_modify_aggregation: "You don't have permission to access the specified aggregation."
-      aggregation_deleted: "{{title}} deleted"
-      build_topic: "Live Search"
-      search_for: "Search for:"
-      new_topic_title: "Search for a new topic and build the results page."
-      add_aggregation: "Add Aggregation"
-      aggregation_updated: "Aggregation Updated"
-      edit_aggregation: "Edit Aggregation"
-      add_opml_to_aggregation: "Add OPML file"
-      save_aggreation: "Save this Aggregation"
-      add_aggregation_title: "Name for aggregation:"
-      save_aggreation_instructions: "Remove any unwanted feeds by clicking on 'Remove'.  You will be able to add new feeds in the next step."
-      remove: "Remove"
-      signup_to_save_aggreation: "{{login}} or {{signup}} to save this search"
-      terms_instructions: "Add as many tags or phrases as you'd like.  Separate each with a comma.  ie food, recipes, best places to eat, organic"
-      topic_generated: "Results for `{{terms}}`."
-      no_terms_error: "Please specify a term or list of terms."
-      download_opml: "Download OPML file for {{terms}}"
-      opml_generated: "Feeds for {{terms}}"
-      opml_feeds_for: "Feeds for {{terms}}"
-      generate_new_topic: "Generate a new topic"
-      topic_feeds_for: "Feeds for {{terms}}"
-      generating_topic_message: "Searching.  This might take a minute or so...."
-      service_feed_name: "{{term}} on {{service}}"
-      related_feeds: "Related Feeds"
-      no_entries_found: "No entries found"
-      read_more: "read more"
-      latest_aggregations: "Latest aggregations"
-      finding_topics: "Searching for relevant stories..."
-      new_search: "New Search"
-      add_sources_by_tag: "Add more feeds by tags."
-      add_more_sources: "Add Sources"
-      no_feeds_found: "No feeds were found"
-      searching_for_feed: "Searching for feeds..."
-      feed_remove: "Feed Removed"
-      photos: "Photos"
-      videos: "Videos"
-      back: "Back"
-      explore: "Search for {{topic}}"
-      language_not_supported: The requested language is not supported
-      get_recommendations: Get Recommendations
-      search_problem: "There was a problem with your search.  Please review your search criteria and try again."
-      comment_entries_count:
-        one: "1 Comment"
-        other: "{{count}} Comments"
-      
+      identity_feed_removed: Removed service
+      finding_topics: Searching for relevant stories...
+      feed_validated_message: Feed was approved.
+      harvested_at: Harvested
+      aggregation_updated: Aggregation Updated
+      related_feeds: Related Feeds
+      add_more_sources: Add Sources
+      description: Description
+      powered_by: powered by
+      netflix_rss: You can find your URL on your {{link}}.  Note that there are several feeds available on your Netflix Queue page (Queue, Recommendations, Movie Reviews, etc).  Add as many as you like!
+      polyvore_rss: Your Polyvore profile URL looks like http://www.polyvore.com/cgi/profile?id=00000
+      build_topic: Live Search
+      save_aggreation_instructions: Remove any unwanted feeds by clicking on 'Remove'.  You will be able to add new feeds in the next step.
+      display_url: "Url to be displayed:"
+      show_tagged_courses: show only courses
+      ok: OK
+      failed_last_request: "Failed last request: {{error}}"
+      select_service_prompt: Please select a service
+      show_related_resources: Show Related Resources
+      already_shared: You've previously shared this page.
+      add_edit_feeds: Add/Edit Feeds
+      harvest_interval: Harvest interval (hrs)
+      resource_search_results: Resources <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>
+      successfully_added_uri_feed: Successfully added {{uri}}
+      no_feeds_found: No feeds were found
+      direct_link: "[direct link]"
+      feed_banned_message: Feed was banned.
+      collections_long: Indexed Collections
+      topic_generated: Results for `{{terms}}`.
+      searching_for_feed: Searching for feeds...
+      search_problem: There was a problem with your search.  Please review your search criteria and try again.
+      default_language: Language
+      title: Title
+      submitting_feed_message: Submitting your feed...
+      add_feed: Add Feed
+      identity_feeds: Identity Feeds
+      added_date: Added
+      no_tagged_courses: No <b>courses</b> were found tagged with <b>{{tags}}</b>. <a href='/resources'>Start over</a> or show <a href='/resources/tags/{{tags}}'>all resources tagged {{tags}}</a>.
+      personal_recommendations: Recommendations
+      feed_id: ID
+      repository_short_title: "Repository Short Title:"
+      previous: Previous
+      facebook_notes: Facebook Notes
+      opml_generated: Feeds for {{terms}}
+    activity_templates: 
+      entry_comment: Comment