muck-raker 0.1.24 → 0.1.25

data/VERSION

@@ -1 +1 @@
-0.1.24
+0.1.25

data/app/models/entry.rb

@@ -48,7 +48,7 @@ class Entry < ActiveRecord::Base
   
   @@default_time_on_page = 60.0
   
-  acts_as_solr({:if => false, :fields => [{:feed_id => :integer}, {:grain_size => :string}]}, {:type_field => :type_s})
+  acts_as_solr({:if => false, :fields => [{:feed_id => :integer}, {:grain_size => :string, :multi_core => true, :default_core => 'en'}]}, {:type_field => :type_s})
 
   def resource_uri 
     self.direct_link.nil? ? self.permalink : self.direct_link
@@ -120,17 +120,6 @@ class Entry < ActiveRecord::Base
     return (old_avg*(clicks-1) + time_on_page)/clicks
   end
 
-  def self.redirect_uri(target, referrer, redirect_type)
-    if !target.direct_link.nil? and redirect_type != "metadata"
-      return target.direct_link if redirect_type == "direct_link" 
-      if !referrer.nil?
-        domain = "http://" + URI.parse(referrer).host
-        return target.direct_link if target.permalink[0..domain.length-1] != domain
-      end
-    end
-    return target.permalink
-  end
-
   def self.track_click(session, recommendation_id, referrer, redirect_type = "direct_link", requester = "unknown", user_agent = "unknown")
     # look up the recommendation
     recommendation = Recommendation.find(recommendation_id)
@@ -143,8 +132,8 @@ class Entry < ActiveRecord::Base
     # get the list of recommendations that have been clicked during this session
     clicks = session[:rids] || Array.new
     
-    # find out where we are going
-    redirect = redirect_uri(target, referrer, redirect_type)
+    # redirect to our frame page
+    redirect = "/visits/#{recommendation.dest_entry_id}"
     
     # track the time on the last page
     track_time_on_page(session, redirect)
@@ -326,6 +315,17 @@ class Entry < ActiveRecord::Base
   
   protected
   
+#  def self.redirect_uri(target, referrer, redirect_type)
+#    if !target.direct_link.nil? and redirect_type != "metadata"
+#      return target.direct_link if redirect_type == "direct_link" 
+#      if !referrer.nil?
+#        domain = "http://" + URI.parse(referrer).host
+#        return target.direct_link if target.permalink[0..domain.length-1] != domain
+#      end
+#    end
+#    return target.permalink
+#  end
+
   def self.normalized_uri(uri)
     uri.sub(/index.?\.(html|aspx|shtm|htm|asp|php|cfm|jsp|shtml|jhtml)$/, '')
   end

data/app/views/recommendations/index.xml.builder

@@ -11,12 +11,12 @@ xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri,
         xml.recommendation do
             xml.title recommendation["title"]
             xml.collection recommendation["collection"]
-            xml.link "http://folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s  
-#            xml.link "http://localhost:3000/r?id=" + recommendation["recommendation_id"].to_s
+            xml.link "http://folksemantic.com/r?id=" + recommendation["id"].to_s  
+#            xml.link "http://localhost:3000/r?id=" + recommendation["id"].to_s
             xml.has_direct_link "true" if (recommendation["direct_link"] != nil and @uri[0..20] == recommendation["uri"][0..20]) 
             
             if @details == true
-	            xml.direct_link "http://www.folksemantic.com/r?id=" + recommendation["recommendation_id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
+	            xml.direct_link "http://www.folksemantic.com/r?id=" + recommendation["id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
 #	            xml.direct_link "http://localhost:3000/r?id=" + recommendation["id"].to_s + "&u=" + recommendation["direct_link"] if recommendation["direct_link"] != nil 
 	            xml.uri recommendation["uri"]
 	            xml.direct_uri recommendation["direct_link"]

data/app/views/recommendations/index_real_time.pjs.erb

@@ -28,8 +28,8 @@ for(nRec = 0; nRec < recs.length; nRec++) {
 	metadata_link = catalog_page && document_host == r.uri.substring(0, document_host.length);
 	direct_link = metadata_link && r.direct_link;
 	document.write('<p class="oer_recommender_item">');
-	document.write('<a class="oer_recommender_recommendation_link" href="' + (r.direct_link ? r.direct_link : r.permalink) + '">' + r.title + ' (' + r.collection + ')</a>');
-	if (direct_link) document.write(' <a class="oer_recommender_direct_link" href="' + app + 'r?id=' + r.id + '&target=direct_link"><%= @direct_link_text %></a>');
+	document.write('<a class="oer_recommender_recommendation_link" href="' + app + 'visits/' + r.id +'">' + r.title + ' (' + r.collection + ')</a>');
+	if (direct_link) document.write(' <a class="oer_recommender_direct_link" href="' + app + 'visits/' + r.id + '?target=direct_link"><%= @direct_link_text %></a>');
 <% if @details == true -%>
 	document.write(' <span class="oer_recommender_published_at">(' + format_date(r.published_at) + ')</span>');
 	document.write(' <span class="oer_recommender_relevance_score"><%= t('muck.raker.relevance')%>: ' + Math.round(r.relevance*100)/100 + '</span>');

data/app/views/recommendations/index_real_time.xml.builder

@@ -10,7 +10,7 @@ xml.recommendations(:document_id => @entry.nil? ? "" : @entry.id, :uri => @uri,
         xml.recommendation do
             xml.title recommendation["title"]
             xml.collection recommendation["collection"]
-            xml.link recommendation["direct_link"].empty? ? recommendation["permalink"] : recommendation["direct_link"] 
+            xml.link "http://folksemantic.com/visits/" + recommendation["id"].to_s
             
             if @details == true
 	            xml.description recommendation["description"]

data/locales/ar.yml

@@ -8,16 +8,23 @@ ar:
       add_feed_advanced: "إضافة الأعلاف (المتقدم)"
       add_feed_title: "إضافة جديدة للتغذية"
       add_feed_url: "العنوان :"
+      adding_comment_message: "واضاف التعليق"
       all_resources: "جميع الموارد"
+      already_shared: "كنت في السابق يشارك في هذه الصفحة."
       atom: ذرة
+      ban_feed: "العلامة تغذية باطلة"
       banned: وحظرت
       calculated: حسبت
       choose_service: "اختيار الخدمة :"
+      close: إغلاق
       collection_description: "ال الوصف :"
       collection_home_uri: "عنوان المجموعة الصفحة الرئيسية"
       collection_uri: "عنوان المجموعة الفوقية :"
       collections: المجموعات
       collections_long: "فهرسة المجموعات"
+      comment_entries_count: 
+        one: "1 تعليق"
+        other: "{{count}}تعليقات"
       course_search_results: "دورات <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "دورات <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "تصفح الدورات باستخدام بطاقات <a href=\"/resources\">[تصفح جميع الموارد]</a>"
@@ -31,14 +38,20 @@ ar:
       display_url: "رابط لعرض :"
       failed_harvests: "فشل المحاصيل"
       failed_last_request: "فشل آخر طلب : {{error}}"
+      feed_banned_message: "تغذية بنجاح المحظورة."
       feed_successfully_created: "نجحت عملية إنشاء تغذية."
       feed_successfully_updated: "تغذية بنجاح تحديث."
+      feed_validated_message: "تغذية بنجاح على صحتها."
       feeds_title: "تسجيل المجموعات"
       for: لأجل
       gm_more_prompt: "مزيد من موارد ذات الصلة"
       gm_title: "موارد ذات الصلة"
       harvest_interval: "حصاد الفاصلة (ساعات)"
       harvested_at: "في حصاد"
+      hide: إخفاء
+      login: "تسجيل الدخول"
+      login_or_signup_prompt: "{{signup}} or {{login}}لمناقشة وتقاسم الموارد."
+      login_to_comment: "الدخول لتتمكن من اضافة تعليق"
       metadata: الفوقية
       narrow_further: "مزيد من تضييق النتائج"
       new_global_feed: "تغذية جديدة أضيفت إلى {{application_name}}"
@@ -60,6 +73,7 @@ ar:
       related_resources: "ذات الصلة"
       related_resources_title: "موارد ذات الصلة"
       relevance: صلة
+      remix: ريمكس
       repository_short_title: "مستودع قصيرة العنوان :"
       repository_title: "مستودع العنوان :"
       resource_search_results: "الموارد <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ ar:
       search_link: "العثور على الموارد!"
       select_feeds_prompt: "اختيار يغذي كنت تريد أن تضيف :"
       select_service_prompt: "يرجى اختيار الخدمة"
+      share: مشاركة
       short_title: "الاسم المختصر :"
       show_tagged_courses: "وتظهر فقط الدورات"
       show_tagged_resources: "وتظهر أي نوع من الموارد"
+      signup: إشترك
       start_over: بدء
       status: حالة
       submitting_feed_message: "تقديم خلاصتك..."
@@ -82,5 +98,7 @@ ar:
       title: العنوان
       type_of_metadata: "نوع من الفوقية :"
       uri: رابط
+      validate_feed: "العلامة تغذية سليمة"
       visit: زيارة
+      write_comment_prompt: "أضف تعليق"
       xml: XML

data/locales/bg.yml

@@ -8,16 +8,23 @@ bg:
       add_feed_advanced: "Добавяне на емисия (Разширено)"
       add_feed_title: "Добавяне на нова емисия"
       add_feed_url: "Url:"
+      adding_comment_message: "Добавяне на коментар"
       all_resources: "Всички ресурси"
+      already_shared: "Вие сте вече споделените тази страница."
       atom: Atom
+      ban_feed: "Марк фуражи за невалидна"
       banned: забранена
       calculated: изчислени
       choose_service: "Изберете услуга:"
+      close: Затварям
       collection_description: "Колекция Описание:"
       collection_home_uri: "Адрес на Колекция Начало на страницата"
       collection_uri: "Адрес на събирането Метаданните:"
       collections: Колекции
       collections_long: "Индексирани Сборници"
+      comment_entries_count: 
+        one: "1 Коментар"
+        other: "{{count}} Коментари"
       course_search_results: "Курсове <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Курсове <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "Търсете курсове с тагове <a href=\"/resources\">[разглеждате всички ресурси]</a>"
@@ -31,14 +38,20 @@ bg:
       display_url: "Url да се покаже:"
       failed_harvests: "Failed реколти"
       failed_last_request: "Failed последната заявка: {{error}}"
+      feed_banned_message: "Feed беше успешно забранява."
       feed_successfully_created: "Feed беше успешно създаден."
       feed_successfully_updated: "Feed бе успешно обновен."
+      feed_validated_message: "Feed беше успешно утвърдени."
       feeds_title: "Регистриран Сборници"
       for: за
       gm_more_prompt: "Още Сродни ресурси"
       gm_title: "Сродни ресурси"
       harvest_interval: "Жетва интервал (часа)"
       harvested_at: ", Събрани в"
+      hide: Крия
+      login: Влизам
+      login_or_signup_prompt: "{{signup}} or {{login}} За обсъждане и споделяне на ресурси."
+      login_to_comment: "Вход за да добавите коментар"
       metadata: метаданни
       narrow_further: "стесните резултатите още"
       new_global_feed: "Новата емисия е добавен към {{application_name}}"
@@ -60,6 +73,7 @@ bg:
       related_resources: свързани
       related_resources_title: "Сродни ресурси"
       relevance: Значението
+      remix: Remix
       repository_short_title: "Хранилището Кратко Заглавие:"
       repository_title: "Хранилището Заглавие:"
       resource_search_results: "Ресурси <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ bg:
       search_link: "Намери ресурси!"
       select_feeds_prompt: "Изберете Feeds бихте искали да добавите:"
       select_service_prompt: "Моля изберете услуга"
+      share: Дял
       short_title: "Кратко заглавие:"
       show_tagged_courses: "Покажи само курсовете"
       show_tagged_resources: "Покажи всякакъв вид ресурс"
+      signup: "Sign Up"
       start_over: "започнем отначало"
       status: Състояние
       submitting_feed_message: "Подавайки Вашата емисия ..."
@@ -82,5 +98,7 @@ bg:
       title: Заглавие
       type_of_metadata: "Вид Метаданните:"
       uri: Url
+      validate_feed: "Марк фуражи за валидно"
       visit: посетете
+      write_comment_prompt: "Добави коментар"
       xml: XML

data/locales/ca.yml

@@ -8,16 +8,23 @@ ca:
       add_feed_advanced: "Afegir canal (avançat)"
       add_feed_title: "Afegir un nou aliment"
       add_feed_url: "Url:"
+      adding_comment_message: "Afegint comentari"
       all_resources: "Tots els Recursos"
+      already_shared: "Que ha compartit aquesta pàgina."
       atom: Atom
+      ban_feed: "Marca d'alimentació com no vàlid"
       banned: prohibit
       calculated: calculat
       choose_service: "Trieu el servei:"
+      close: Tancar
       collection_description: "Col lecció Descripció:"
       collection_home_uri: "Direcció de la Col lecció Pàgina d'inici"
       collection_uri: "Direcció de la Col lecció de metadades:"
       collections: "Col leccions"
       collections_long: "Col leccions indexades"
+      comment_entries_count: 
+        one: "1 Comentari"
+        other: "{{count}} Comentaris"
       course_search_results: "Cursos <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Cursos <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "navegar per els cursos utilitzant les etiquetes <a href=\"/resources\">[explorar tots els recursos]</a>"
@@ -31,14 +38,20 @@ ca:
       display_url: "URL que es mostrarà:"
       failed_harvests: "Males collites"
       failed_last_request: "Error darrera petició: {{error}}"
+      feed_banned_message: "L&#39;alimentació s&#39;ha prohibit."
       feed_successfully_created: "L&#39;alimentació s&#39;ha creat correctament."
       feed_successfully_updated: "L&#39;alimentació s&#39;ha actualitzat."
+      feed_validated_message: "L&#39;alimentació s&#39;ha validat."
       feeds_title: "Col leccions de registre"
       for: per
       gm_more_prompt: "Més Recursos relacionats"
       gm_title: "Recursos relacionats"
       harvest_interval: "Collita d&#39;interval (hores)"
       harvested_at: "Collits a"
+      hide: Amaga
+      login: "Inici de sessió"
+      login_or_signup_prompt: "{{signup}} or {{login}} Per discutir i compartir recursos."
+      login_to_comment: "Heu d&#39;entrar per a afegir un comentari"
       metadata: metadades
       narrow_further: "limitar els resultats més"
       new_global_feed: "Un nou aliment s&#39;ha afegit a {{application_name}}"
@@ -60,11 +73,12 @@ ca:
       related_resources: relacionats
       related_resources_title: "Recursos relacionats"
       relevance: pertinència
+      remix: Remix
       repository_short_title: "Repositori Títol curt:"
       repository_title: "Títol del repositori:"
       resource_search_results: "Recursos <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       resource_tag_results: "Recursos <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
-      resources_tag_cloud_label: "buscar recursos utilitzant les etiquetes <a href=\"/resources?grain_size=course\">[navegar només els cursos]</a>"
+      resources_tag_cloud_label: "buscar recursos mitjançant etiquetes <a href=\"/resources?grain_size=course\">[navegar només els cursos]</a>"
       results: Resultats
       rss: RSS
       search: cerca
@@ -72,9 +86,11 @@ ca:
       search_link: "Troba Recursos!"
       select_feeds_prompt: "Seleccioneu les fonts que vulguis afegir:"
       select_service_prompt: "Si us plau, seleccioneu un servei"
+      share: Compartir
       short_title: "Títol curt:"
       show_tagged_courses: "mostrar només els cursos"
       show_tagged_resources: "mostrar qualsevol tipus de recurs"
+      signup: "Registra&#39;t"
       start_over: "començar de nou"
       status: Estatus
       submitting_feed_message: "La presentació de la seva feed ..."
@@ -82,5 +98,7 @@ ca:
       title: Títol
       type_of_metadata: "Tipus de Metadades:"
       uri: Url
+      validate_feed: "Marcar com a vàlids els pinsos"
       visit: visita
+      write_comment_prompt: "Afegir un comentari"
       xml: XML

data/locales/cs.yml

@@ -8,16 +8,23 @@ cs:
       add_feed_advanced: "Přidat Feed (Advanced)"
       add_feed_title: "Přidat nový krmivo"
       add_feed_url: "Url:"
+      adding_comment_message: "Přidání komentáře"
       all_resources: "Všechny zdroje"
+      already_shared: "Které jste již do této stránce."
       atom: Atom
+      ban_feed: "Označit jako neplatný krmiva"
       banned: zakázána
       calculated: vypočtené
       choose_service: "Zvolte si službu:"
+      close: Zavřít
       collection_description: "Popis sběru:"
       collection_home_uri: "Adresa Sbírce Úvodní stránka"
       collection_uri: "Adresa Sbírce Metadata:"
       collections: Sbírky
       collections_long: "Indexovaná Sbírky"
+      comment_entries_count: 
+        one: "1 Comment"
+        other: "{{count}} Komentáře"
       course_search_results: "Kurzy <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Kurzy <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "prohlížet kurzy pomocí tagů <a href=\"/resources\">[procházet všechny zdroje]</a>"
@@ -31,14 +38,20 @@ cs:
       display_url: "URL, které mají být zobrazeny:"
       failed_harvests: "Nepodařilo sklizně"
       failed_last_request: "Nepodařilo poslední dotaz: {{error}}"
+      feed_banned_message: "Krmivo bylo úspěšně zakázány."
       feed_successfully_created: "Krmivo bylo úspěšně vytvořeno."
       feed_successfully_updated: "Krmivo bylo úspěšně aktualizováno."
+      feed_validated_message: "Feed byl úspěšně ověřen."
       feeds_title: "Registrovaní Sbírky"
       for: pro
       gm_more_prompt: "Více Související zdroje"
       gm_title: "Související zdroje informací"
       harvest_interval: "Sklizeň interval (hod)"
       harvested_at: "Sklízen na"
+      hide: Skrýt
+      login: Přihlásit
+      login_or_signup_prompt: "{{signup}} or {{login}} K diskusi a sdílení zdrojů."
+      login_to_comment: "Přihlásit se přidat komentář"
       metadata: metadata
       narrow_further: "úzký výsledků dalšího"
       new_global_feed: "Nová krmiva byla přidána do {{application_name}}"
@@ -60,6 +73,7 @@ cs:
       related_resources: související
       related_resources_title: "Související zdroje informací"
       relevance: relevance
+      remix: Remix
       repository_short_title: "Repository Krátké Název:"
       repository_title: "Repository Název:"
       resource_search_results: "Zdroje <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ cs:
       search_link: "Najít zdroje!"
       select_feeds_prompt: "Vyberte kanály chcete přidat:"
       select_service_prompt: "Prosím, vyberte službu"
+      share: Sdílet
       short_title: "Zkrácený název:"
       show_tagged_courses: "zobrazit pouze kurzy"
       show_tagged_resources: "zobrazit jakýkoliv druh zdroje"
+      signup: "Zaregistruj se"
       start_over: "začít znovu"
       status: Stav
       submitting_feed_message: "Pošlete svůj zdroj ..."
@@ -82,5 +98,7 @@ cs:
       title: Název
       type_of_metadata: "Typ Metadata:"
       uri: Url
+      validate_feed: "Označit krmiva za platnou"
       visit: navštivte
+      write_comment_prompt: "Přidat komentář"
       xml: XML

data/locales/da.yml

@@ -8,16 +8,23 @@ da:
       add_feed_advanced: "Tilføj feed (Advanced)"
       add_feed_title: "Tilføj en ny feed"
       add_feed_url: "Url:"
+      adding_comment_message: "Tilføje kommentar"
       all_resources: "Alle ressourcer"
+      already_shared: "Du tidligere har delt denne side."
       atom: Atom
+      ban_feed: "Mark foder som ugyldige"
       banned: forbudt
       calculated: beregnes
       choose_service: "Vælg tjeneste:"
+      close: Luk
       collection_description: "Indsamling Beskrivelse:"
       collection_home_uri: "Adresse på den Collection Home Page"
       collection_uri: "Adresse på den Indsamling Metadata:"
       collections: Samlinger
       collections_long: "Indekseret Samlinger"
+      comment_entries_count: 
+        one: "1 Kommentar"
+        other: "{{count}} Kommentarer"
       course_search_results: "Kurser <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Kurser <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "gennemse kurser benytter tags <a href=\"/resources\">[gennemse alle ressourcer]</a>"
@@ -31,14 +38,20 @@ da:
       display_url: "Webadresse, der skal vises:"
       failed_harvests: "Undladt høst"
       failed_last_request: "Mislykket sidste anmodning: {{error}}"
+      feed_banned_message: "Feed blev forbudt."
       feed_successfully_created: "Foder er blevet oprettet."
       feed_successfully_updated: "Foder er blevet opdateret."
+      feed_validated_message: "Feed blev valideret."
       feeds_title: "Registreret Samlinger"
       for: for
       gm_more_prompt: "Mere Relaterede ressourcer"
       gm_title: "Relaterede ressourcer"
       harvest_interval: "Harvest interval (timer)"
       harvested_at: "Høstet ved"
+      hide: Gemme
+      login: Login
+      login_or_signup_prompt: "{{signup}} or {{login}} At diskutere og dele ressourcer."
+      login_to_comment: "Log ind for at tilføje en kommentar"
       metadata: metadata
       narrow_further: "indsnævre resultaterne yderligere"
       new_global_feed: "Et nyt foder er blevet føjet til {{application_name}}"
@@ -60,6 +73,7 @@ da:
       related_resources: relaterede
       related_resources_title: "Relaterede ressourcer"
       relevance: relevant
+      remix: Remix
       repository_short_title: "Repository&#39;et korte titel:"
       repository_title: "Repository&#39;et Titel:"
       resource_search_results: "Ressourcer <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ da:
       search_link: "Find ressourcer!"
       select_feeds_prompt: "Vælg de feeds, du ønsker at tilføje:"
       select_service_prompt: "Vælg en tjeneste"
+      share: Del
       short_title: "Kort titel:"
       show_tagged_courses: "Vis kun kurser"
       show_tagged_resources: "vise nogen form for ressource"
+      signup: Tilmeld
       start_over: "starte forfra"
       status: Status
       submitting_feed_message: "Indsende dit feed ..."
@@ -82,5 +98,7 @@ da:
       title: Titel
       type_of_metadata: "Type Metadata:"
       uri: Url
+      validate_feed: "Mark feed som gyldige"
       visit: besøg
+      write_comment_prompt: "Tilføj en kommentar"
       xml: XML

data/locales/de.yml

@@ -8,16 +8,23 @@ de:
       add_feed_advanced: "Feed hinzufügen (Advanced)"
       add_feed_title: "Fügen Sie einen neuen Feed"
       add_feed_url: "Url:"
+      adding_comment_message: "Kommentar hinzufügen"
       all_resources: "Alle Ressourcen"
+      already_shared: "Sie haben zuvor freigegebenen dieser Seite."
       atom: Atom
+      ban_feed: "Mark-Feed als ungültig"
       banned: verboten
       calculated: berechnet
       choose_service: "Wählen Sie "Service:"
+      close: Schließen
       collection_description: "Collection Beschreibung:"
       collection_home_uri: "Adresse der Homepage der Sammlung"
       collection_uri: "Adresse der Collection Metadata:"
       collections: Sammlungen
       collections_long: "Indexed Collections"
+      comment_entries_count: 
+        one: "1 Kommentar"
+        other: "{{count}} Kommentare"
       course_search_results: "Kurse <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Kurse <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "Navigieren Kurse mit Tags <a href=\"/resources\">[Durchsuchen aller Ressourcen]</a>"
@@ -31,14 +38,20 @@ de:
       display_url: "URL angezeigt werden soll:"
       failed_harvests: "Fehler Ernten"
       failed_last_request: "Failed letzte Anfrage: {{error}}"
+      feed_banned_message: "Feed wurde erfolgreich verboten."
       feed_successfully_created: "Feed wurde erfolgreich erstellt."
       feed_successfully_updated: "Feed wurde erfolgreich aktualisiert."
+      feed_validated_message: "Feed wurde erfolgreich validiert."
       feeds_title: "Registriert Sammlungen"
       for: für
       gm_more_prompt: "Mehr Verwandte Ressourcen"
       gm_title: "Verwandte Ressourcen"
       harvest_interval: "Harvest Intervall (Std.)"
       harvested_at: "Ernte bei"
+      hide: Verstecken
+      login: Anmeldung
+      login_or_signup_prompt: "{{signup}} or {{login}} Zu diskutieren und zu gemeinsamen Nutzung von Ressourcen."
+      login_to_comment: "Anmelden, um einen Kommentar hinzufügen"
       metadata: Metadaten
       narrow_further: "Suchergebnisse weiter"
       new_global_feed: "Eine neue Feed wurde hinzugefügt, um {{application_name}}"
@@ -60,6 +73,7 @@ de:
       related_resources: Zusammenhang
       related_resources_title: "Verwandte Ressourcen"
       relevance: Relevanz
+      remix: Remix
       repository_short_title: "Repository Kurztitel:"
       repository_title: "Repository-Titel:"
       resource_search_results: "Ressourcen <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ de:
       search_link: Ressourcen!
       select_feeds_prompt: "Wählen Sie die Feeds, die Sie hinzufügen möchten:"
       select_service_prompt: "Bitte wählen Sie einen Dienst"
+      share: Anteil
       short_title: "Kurztitel:"
       show_tagged_courses: "zeigt nur die Kurse"
       show_tagged_resources: "zeigen, jede Art von Ressourcen"
+      signup: "Sign Up"
       start_over: starten
       status: Status
       submitting_feed_message: "Einreichen Ihres Feeds ..."
@@ -82,5 +98,7 @@ de:
       title: Titel
       type_of_metadata: "Art der Metadaten:"
       uri: Url
+      validate_feed: "Mark-Feed als gültig"
       visit: Besuch
+      write_comment_prompt: "Einen Kommentar hinzufügen"
       xml: XML

data/locales/el.yml

@@ -8,16 +8,23 @@ el:
       add_feed_advanced: "Προσθήκη Feed (Advanced)"
       add_feed_title: "Προσθέστε μια νέα ειδοποίηση"
       add_feed_url: "Url:"
+      adding_comment_message: "Adding σχόλιο"
       all_resources: "Όλοι οι πόροι"
+      already_shared: "Έχετε προηγουμένως από κοινού αυτή τη σελίδα."
       atom: Atom
+      ban_feed: "Mark ζωοτροφών ως άκυρο"
       banned: απαγορευθεί
       calculated: υπολογίζονται
       choose_service: "Επιλέξτε υπηρεσία:"
+      close: Κλείνω
       collection_description: "Συλλογή Περιγραφή:"
       collection_home_uri: "Διεύθυνση του Συλλογή Αρχική Σελίδα"
       collection_uri: "Διεύθυνση του Συλλογή Μεταδεδομένα:"
       collections: Συλλογές
       collections_long: "Τιμαριθμοποιημένος Συλλογές"
+      comment_entries_count: 
+        one: "1 Σχόλιο"
+        other: "{{count}} Σχόλια"
       course_search_results: "Μαθήματα <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
       course_tag_results: "Μαθήματα <b>{{first}} - {{last}}</b> of <b>{{total}}</b> tagged <b>{{terms}}</b>"
       courses_tag_cloud_label: "περιηγηθείτε μαθήματα με τη χρήση ετικετών <a href=\"/resources\">[περιηγηθείτε σε όλους τους πόρους]</a>"
@@ -31,14 +38,20 @@ el:
       display_url: "Url που θα εμφανίζεται:"
       failed_harvests: "Αποτυχία συγκομιδές"
       failed_last_request: "Αποτυχία τελευταία αίτηση: {{error}}"
+      feed_banned_message: "Οι ζωοτροφές που είχε απαγορευτεί με επιτυχία."
       feed_successfully_created: "Οι ζωοτροφές που δημιουργήθηκε με επιτυχία."
       feed_successfully_updated: "Οι ζωοτροφές που είχε ενημερωθεί με επιτυχία."
+      feed_validated_message: "Οι ζωοτροφές που είχε επικυρωθεί με επιτυχία."
       feeds_title: "Εγγεγραμμένοι Συλλογές"
       for: για
       gm_more_prompt: "Περισσότερα Σχετικοί πόροι"
       gm_title: "Σχετικοί πόροι"
       harvest_interval: "Τρύγος διάστημα (ώρες)"
       harvested_at: "Κατά τη συγκομιδή"
+      hide: Κρύβομαι
+      login: Σύνδεση
+      login_or_signup_prompt: "{{signup}} or {{login}} Να συζητήσουν και να μοιράζονται πόρους."
+      login_to_comment: "Σύνδεση για να προσθέσετε ένα σχόλιο"
       metadata: μεταδεδομένα
       narrow_further: "στενό περαιτέρω τα αποτελέσματα"
       new_global_feed: "Ένα νέο ζωοτροφές έχει προστεθεί στην {{application_name}}"
@@ -60,6 +73,7 @@ el:
       related_resources: συναφείς
       related_resources_title: "Σχετικοί πόροι"
       relevance: ενδιαφέρον
+      remix: Remix
       repository_short_title: "Repository Σύντομη Τίτλος:"
       repository_title: "Repository Τίτλος:"
       resource_search_results: "Πόροι <b>{{first}} - {{last}}</b> of <b>{{total}}</b> for search <b>{{terms}}</b>"
@@ -72,9 +86,11 @@ el:
       search_link: "Βρείτε Πόρων!"
       select_feeds_prompt: "Επιλέξτε τις ζωοτροφές που θα θέλατε να προσθέσετε:"
       select_service_prompt: "Παρακαλώ επιλέξτε μια υπηρεσία"
+      share: Μοιράζομαι
       short_title: "Σύντομος τίτλος:"
       show_tagged_courses: "Δείτε μόνο τα μαθήματα"
       show_tagged_resources: "παρουσιάζουν οποιοδήποτε είδος πόρου"
+      signup: Εγγραφή
       start_over: "ξεκινούν κατά"
       status: Κατάσταση
       submitting_feed_message: "Submitting σας ζωοτροφών ..."
@@ -82,5 +98,7 @@ el:
       title: Τίτλος
       type_of_metadata: "Είδος Μεταδεδομένα:"
       uri: Url
+      validate_feed: "Mark ζωοτροφές, όπως ισχύει"
       visit: επίσκεψη
+      write_comment_prompt: "Προσθέστε ένα σχόλιο"
       xml: XML