publify_core 9.0.0 → 9.2.2

data/app/views/setup/index.html.erb

@@ -1,17 +1,17 @@
-<%= form_tag :action=> 'index' do %>
+<%= form_tag action: 'index' do %>
   <div class='alert alert-info'>
-    <small><%= t(".welcome_to_your_blog_setup", publify: link_to("Publify", 'http://publify.co'))%></small>
+    <small><%= t('.welcome_to_your_blog_setup', publify: link_to('Publify', 'https://publify.github.io/')) %></small>
   </div>
   <div class='form-group'>
-    <%= text_field(:setting, :blog_name, { :class=> 'form-control', :placeholder => t(".blog_name")})%>
+    <%= text_field(:setting, :blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
   </div>
   <div class='form-group'>
-    <%= text_field(:setting, :email, { :class=> 'form-control', :placeholder => t(".your_mail")})%>
+    <%= text_field(:setting, :email, class: 'form-control', placeholder: t('.your_mail')) %>
   </div>
   <div class='form-group'>
-    <%= label_tag :setting_password, t('.password') %><br>
-    <%= password_field(:setting, :password, { :class=> 'form-control' })%>
+    <%= label_tag :setting_password, t('.password') %><br />
+    <%= password_field(:setting, :password, class: 'form-control') %>
   </div>
 
-  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save')%>">
+  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>" />
 <% end %>

data/app/views/shared/_atom_header.atom.builder

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
+
 feed.title(feed_title)
-if this_blog.blog_subtitle.present?
-  feed.subtitle(this_blog.blog_subtitle, 'type' => 'html')
-end
+feed.subtitle(this_blog.blog_subtitle, "type" => "html") if this_blog.blog_subtitle.present?
 feed.updated items.first.updated_at if items.first
-feed.generator 'Publify', uri: 'http://www.publify.co', version: PublifyCore::VERSION
+feed.generator "Publify", uri: "https://publify.github.io", version: PublifyCore::VERSION

data/app/views/shared/_atom_item_article.atom.builder

@@ -1,46 +1,36 @@
-feed.entry item, id: "urn:uuid:#{item.guid}", published: item.published_at, url: item.permalink_url do |entry|
+# frozen_string_literal: true
+
+feed.entry(item, id: "urn:uuid:#{item.guid}", published: item.published_at,
+                 url: item.permalink_url) do |entry|
   entry.author do
-    name = begin
-             item.user.name
-           rescue
-             item.author
-           end
-    email = begin
-              item.user.email
-            rescue
-              nil
-            end
-    entry.name name
-    entry.email email unless email.blank? || !this_blog.link_to_author
+    entry.name item.author_name
   end
 
   if item.is_a?(Note)
-    entry.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...'), 'type' => 'html'
+    truncated_body = truncate(item.html(:body).strip_html,
+                              length: 80, separator: " ", omissions: "...")
+    entry.title truncated_body, "type" => "html"
   else
-    entry.title item.title, 'type' => 'html'
+    entry.title item.title, "type" => "html"
   end
 
   if item.is_a?(Article)
 
     item.tags.each do |tag|
-      entry.category 'term' => tag.display_name, 'scheme' => tag_url(tag.permalink)
+      entry.category "term" => tag.display_name, "scheme" => tag_url(tag.permalink)
     end
 
+    # TODO: Add tests for this
     item.resources.each do |resource|
-      if resource.size > 0 # The Atom spec disallows files with size=0
-        entry.tag! :link, 'rel' => 'enclosure',
-                          type: resource.mime,
-                          title: item.title,
-                          href: this_blog.file_url(resource.upload_url),
-                          length: resource.size
-      else
-        entry.tag! :link, 'rel' => 'enclosure',
-                          type: resource.mime,
-                          title: item.title,
-                          href: this_blog.file_url(resource.upload_url)
-      end
+      link_options = { rel: "enclosure",
+                       type: resource.mime,
+                       title: item.title,
+                       href: this_blog.file_url(resource.upload_url) }
+      # The Atom spec disallows files with size=0
+      link_options[:length] = resource.size if resource.size > 0
+      entry.tag! :link, link_options
     end
   end
   content_html = fetch_html_content_for_feeds(item, this_blog)
-  entry.content content_html + item.get_rss_description, 'type' => 'html'
+  entry.content content_html + item.rss_description, "type" => "html"
 end

data/app/views/shared/_atom_item_comment.atom.builder

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
   entry.author do
     entry.name item.author
     entry.uri item.url
   end
-  entry.title item.feed_title, 'type' => 'html'
-  entry.content html(item), 'type' => 'html'
+  entry.title item.feed_title, "type" => "html"
+  entry.content html(item), "type" => "html"
 end

data/app/views/shared/_atom_item_trackback.atom.builder

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 feed.entry item, id: "urn:uuid:#{item.guid}", url: item.permalink_url do |entry|
   entry.author do
     entry.name item.blog_name
     entry.uri item.url
   end
-  entry.title item.feed_title, 'type' => 'html'
-  entry.summary item.excerpt, 'type' => 'html'
+  entry.title item.feed_title, "type" => "html"
+  entry.summary item.excerpt, "type" => "html"
 end

data/app/views/shared/_google_analytics.html.erb

@@ -0,0 +1,8 @@
+<script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+  var pageTracker = _gat._getTracker("<%= this_blog.google_analytics %>");
+  pageTracker._trackPageview();
+</script>

data/app/views/shared/_page_header.html.erb

@@ -1,26 +1,23 @@
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <%= meta_tag 'ICBM', this_blog.geourl_location if this_blog.geourl_location.present? %>
-<%= meta_tag 'description', @description unless @description.blank? %>
+<%= meta_tag 'description', @description if @description.present? %>
 <%= meta_tag 'robots', 'noindex, follow' if stop_index_robots?(this_blog) %>
-<%= meta_tag 'google-site-verification', this_blog.google_verification unless this_blog.google_verification.blank?%>
-<meta name="generator" content="Publify <%=PublifyCore::VERSION%>">
+<%= meta_tag 'google-site-verification', this_blog.google_verification if this_blog.google_verification.present? %>
+<meta name="generator" content="Publify <%= PublifyCore::VERSION %>" />
 <%= show_meta_keyword %>
 <% if feed_atom %>
-  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>">
+  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>" />
 <% end %>
 <% if feed_rss %>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>">
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>" />
 <% end %>
 <%= javascript_include_tag :publify, async: Rails.env.production? %>
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag :publify %>
 <%= page_header_includes %>
-<% if this_blog.use_canonical_url %>
-  <link rel="canonical" href="<%= this_blog.base_url + request.fullpath %>" />
-<% end %>
-<%= raw this_blog.custom_tracking_field unless this_blog.custom_tracking_field.blank? %>
-<%= google_analytics %>
+<link rel="canonical" href="<%= this_blog.url_for request.fullpath %>" />
+<%= raw this_blog.custom_tracking_field if this_blog.custom_tracking_field.present? %>
+<%= render 'shared/google_analytics' if this_blog.google_analytics.present? %>
 
 <%= meta_tag 'og:site_name', this_blog.blog_name %>
 <%= meta_tag 'og:title', @article ? @article.title : @page_title %>
-<link ref='author' href="humans.txt">

data/app/views/shared/_rss_item_article.rss.builder

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 xm.item do
   if item.is_a?(Note)
-    xm.title truncate(item.html(:body).strip_html, length: 80, separator: ' ', omissions: '...')
+    xm.title truncate(item.html(:body).strip_html, length: 80, separator: " ",
+                                                   omissions: "...")
   else
     xm.title item.title
   end
   content_html = fetch_html_content_for_feeds(item, this_blog)
-  xm.description content_html + item.get_rss_description
+  xm.description content_html + item.rss_description
   xm.pubDate item.published_at.rfc822
-  xm.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
-  xm.author "#{item.user.email} (#{item.user.name})" if item.link_to_author?
+  xm.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
+  xm.dc :creator, item.author_name
 
   if item.is_a?(Article)
-    xm.comments(item.permalink_url('comments'))
+    xm.comments(item.permalink_url("comments"))
     item.tags.each do |tag|
       xm.category tag.display_name
     end
@@ -21,8 +24,7 @@ xm.item do
       xm.enclosure(
         url: item.blog.file_url(resource.upload_url),
         length: resource.size,
-        type: resource.mime
-      )
+        type: resource.mime)
     end
   end
 

data/app/views/shared/_rss_item_comment.rss.builder

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 feed.item do
   feed.title item.feed_title
   feed.description html(item)
   feed.pubDate item.created_at.rfc822
-  feed.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
+  feed.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
   feed.link item.permalink_url
 end

data/app/views/shared/_rss_item_trackback.rss.builder

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 feed.item do
   feed.title item.feed_title
   feed.description item.excerpt
   feed.pubDate item.created_at.rfc822
-  feed.guid "urn:uuid:#{item.guid}", 'isPermaLink' => 'false'
+  feed.guid "urn:uuid:#{item.guid}", "isPermaLink" => "false"
   feed.link item.url
 end

data/app/views/sidebar/display_plugins.html.erb

@@ -1,4 +1,4 @@
-<% benchmark "BENCHMARK: display_plugins" do %>
+<% benchmark 'BENCHMARK: display_plugins' do %>
   <% @sidebars.each do |sidebar| %>
     <%= render sidebar %>
   <% end %>

data/app/views/tag_sidebar/_content.html.erb

@@ -1,5 +1,5 @@
 <% unless sidebar.tags.blank? %>
-  <h3 class="sidebar-title"><%= t(".tags")%></h3>
+  <h3 class="sidebar-title"><%= t('.tags') %></h3>
   <div class="sidebar-body">
     <p style="overflow:hidden">
     <% sidebar.tags.each do |tag| %>

data/app/views/tags/index.html.erb

@@ -9,7 +9,7 @@
       <% end %>
     </ul>
   <% else %>
-    <p><%= t(".there_are_no_tags") %></p>
+    <p><%= t('.there_are_no_tags') %></p>
   <% end %>
 </div>
 <p><%= paginate @tags %></p>

data/app/views/xml/_googlesitemap_item_article.googlesitemap.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod item.updated_at.xmlschema

data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod collection_lastmod(item)

data/app/views/xml/_googlesitemap_item_page.googlesitemap.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod item.updated_at.xmlschema

data/app/views/xml/_googlesitemap_item_tag.googlesitemap.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xm.url do
   xm.loc item.permalink_url
   xm.lastmod collection_lastmod(item)

data/app/views/xml/sitemap.googlesitemap.builder

@@ -1,5 +1,7 @@
-xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
-xml.urlset 'xmlns' => 'http://www.google.com/schemas/sitemap/0.84' do
+# frozen_string_literal: true
+
+xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
+xml.urlset "xmlns" => "http://www.google.com/schemas/sitemap/0.84" do
   @items.each do |item|
     render "googlesitemap_item_#{item.class.name.to_s.downcase}",
            item: item, xm: xml

data/config/i18n-tasks.yml

@@ -17,11 +17,6 @@ data:
     - ['*_sidebar.*', 'config/locales/sidebars.%{locale}.yml']
     - config/locales/%{locale}.yml
 
-  yaml:
-    write:
-      # do not wrap lines at 80 characters
-      line_width: -1
-
 # Find translate calls
 search:
   ## Paths or `File.find` patterns to search in:

data/config/initializers/devise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -6,13 +8,15 @@ Devise.setup do |config|
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
   # by default. You can change it below and use your own secret key.
-  # config.secret_key = '99a1fd068906f7a32686e001fff91fdfb88703303de85657ab63ad5405ae7c3b215c144c0dd4eaf2e68f3e3dae8c43e132968dd0b32e4c78ac1e86b202e3c6ee'
+  # config.secret_key =
+  #   '99a1fd068906f7a32686e001fff91fdfb88703303de85657ab63ad5405ae7c3b' \
+  #   '215c144c0dd4eaf2e68f3e3dae8c43e132968dd0b32e4c78ac1e86b202e3c6ee'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'default@publify.co'
+  config.mailer_sender = "change-me@example.com"
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -21,7 +25,7 @@ Devise.setup do |config|
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require 'devise/orm/active_record'
+  require "devise/orm/active_record"
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
@@ -99,7 +103,9 @@ Devise.setup do |config|
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = 'cd666dfd37982f9981838aa0bc32a04099d309a831dffcf64c3ec1814e9ae9ad4fde148638675ee2443b5c532222ff007c032e76fc0eec24c5fb4fccfd3546a3'
+  # config.pepper =
+  #   'cd666dfd37982f9981838aa0bc32a04099d309a831dffcf64c3ec1814e9ae9ad' \
+  #   '4fde148638675ee2443b5c532222ff007c032e76fc0eec24c5fb4fccfd3546a3'
 
   # Send a notification email when the user's password is changed
   # config.send_password_change_notification = false

data/config/initializers/mime_types.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-Mime::Type.register_alias "application/xml",     :googlesitemap
+Mime::Type.register_alias "application/xml", :googlesitemap

data/config/locales/da.yml

@@ -5,7 +5,8 @@ da:
     back_to_login: Back to login
     confirm:
       admin: admin
-      dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be able to login anymore
+      dont_lose_the_mail_sent: Don't lose the mail sent at %{email} or you won't be
+        able to login anymore
       login: Brugernavn %{login}
       proceed_to: Proceed to %{link}
       success: You have successfully signed up.
@@ -29,6 +30,7 @@ da:
       access_granted:
         error: Error, you are not allowed to perform this action
       article_list:
+        feedback: Diskussion
         no_articles: There are no articles yet. Why don't you start and create one?
       autosave:
         success: Article was successfully saved
@@ -37,9 +39,10 @@ da:
       form:
         allow_comments: Tillad kommentarer
         allow_comments_status:
-          one: aktiveret
-          zero: disabled
+          disabled: disabled
+          enabled: aktiveret
         allowed_comments_html: Comments are %{allow_comment}
+        article_filter: Artikelfilter
         article_type: Article type
         cancel: Anuller
         default: Default
@@ -57,20 +60,28 @@ da:
         save_as_draft: Save as draft
         status: Status
         tags: Tags
-        tags_explanation_html: Separate tags with commas. Use double quotes (") around multi-word tags, e.g. "opera house".
+        tags_explanation_html: Separate tags with commas. Use double quotes (")
+          around multi-word tags, e.g. "opera house".
         title: Titel
         type_your_post: Type your post
         visibility: Visibility
       index:
+        actions: Actions
         all_articles: All articles
+        author: Forfatter
+        created_at: Created at
         drafts: Kladder
+        feedback: Diskussion
         manage_articles: Administrer artikler
         new_article: Ny Artikel
         publication_date: Publication date
         publication_pending: Publication pending
         published: Offentliggjort
+        published_at: Publication date
         search: Search
         select_an_author: Select an author
+        text_filter: Text filter
+        title: Titel
         withdrawn: Withdrawn
       update:
         success: Article was successfully updated
@@ -83,35 +94,31 @@ da:
       drafts:
         no_drafts_yet: No drafts yet, why don't you start and write one
         your_drafts: Your drafts
-      inbound:
-        at: at
-        at_an_unknown_date: at an unknown date
-        inbound_links: Indkomne links
-        made_a_link_to_you_on: " har lavet et link til dig, og skrevet "
-        no_one_made_link_to_you_yet: Der er endnu ingen der har linket til dig
-        you_have_no_internet_connection: Du har ingen internet forbindelse
       index:
+        textile_deprecated_html: The Textile text filter has been deprecated and will
+          be removed soon. Some of your content still uses this filter. Run the <code>publify:textile_to_markdown</code>
+          rake task to convert it to Markdown, or convert your content manually.
         welcome_back: Velkommen tilbage, %{user_name}!
       overview:
         change_your_blog_presentation: ændre din blogs udseende
-        customization_explain_html: Du kan også tilpasse designet, %{theme_link} eller %{sidebar_link}.
-        dashboard_explain_html: Dette sted giver dig en hurtig oversigt over, hvad der sker på din Publify blog, og hvad du kan gøre. Måske du ønsker at %{available_actions}.
+        customization_explain_html: Du kan også tilpasse designet, %{theme_link} eller
+          %{sidebar_link}.
+        dashboard_explain_html: Dette sted giver dig en hurtig oversigt over, hvad
+          der sker på din Publify blog, og hvad du kan gøre. Måske du ønsker at %{available_actions}.
         enable_plugins: tilføje plugins
         help_explain_html: If you need help, %{doc_link}.
         read_our_documentation: read our documentation
-        update_your_profile_or_change_your_password: opdatere din profil eller rette dit kodeord
+        update_your_profile_or_change_your_password: opdatere din profil eller rette
+          dit kodeord
         write_a_page: skrive en side
         write_a_post: skrive en artikel
-      publify_version:
-        error: You are at least one major version of Publify out of date. You should upgrade immediately. Download and install <a href='http://publify.co/stable.tgz'>the latest Publify version</a>
-        notice: There's a new version of Publify available. Why don't you upgrade to <a href='http://publify.co/stable.tgz'>the latest Publify version</a>?
-        warning: There's a new version of Publify available which may contain important bug fixes. Why don't you upgrade to <a href='http://publify.co/stable.tgz'>the latest Publify version</a>?
       welcome:
         approved_count:
           one: 1 approved
           other: "%{count} approved"
           zero: no approved
-        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count}
+          comments were posted since your last connexion"
         articles_count:
           one: 1 artikel
           other: "%{count} artikler"
@@ -186,7 +193,7 @@ da:
         success: Deleted
       edit:
         action_or_other_html: "%{first_action} eller %{second_action}"
-        author: Author
+        author: Forfatter
         cancel: Cancel
         comments_for_html: Comments for %{article_link}
         edit_a_comment: Edit a comment
@@ -194,11 +201,12 @@ da:
         save: Gem
         url: Url
         your_comment: Your comment
-      ham:
-        by: by
-        created_on: 'on'
       index:
+        actions: Actions
         all: All
+        author: Forfatter
+        content: Indhold
+        created_at: Created at
         feedback: Diskussion
         ham: Ham
         no_feedback: There is no feedback yet. Why don't you create some?
@@ -206,12 +214,8 @@ da:
         presumed_spam: Presumed spam
         select_all: Select all
         spam: Spam
+        status: Status
         unapproved_comments: Unapproved comments
-      spam:
-        by: by
-        cancel: Anuller
-        created_on: 'on'
-        this_comment_by_was_flagged_as_spam_html: This comment by %{author} was flagged as spam, %{cancel_link}?
       state:
         ham: Ham
         just_marked_as_ham: Just Marked As Ham
@@ -237,6 +241,8 @@ da:
         update_database_now: Updatér database nu
         you_are_up_to_date: Du er up to date!
     notes:
+      edit:
+        notes: Notes
       form:
         cancel: Anuller
         compose_new_note: Compose new note
@@ -250,8 +256,14 @@ da:
         publish_at: Offentliggjort den
         publish_settings: Publish settings
         tweet_id_like: Tweet id like 123456
-      header:
+      index:
         notes: Notes
+      list:
+        actions: Actions
+        author: Forfatter
+        created_at: Created at
+        text_filter: Text filter
+        title: Titel
       show:
         action_or_other_html: "%{first_action} eller %{second_action}"
         are_you_sure: Are you sure you want to delete this note
@@ -264,20 +276,21 @@ da:
       form:
         article_filter: Artikelfilter
         cancel: Anuller
-        offline: offline
         online: Online
         permanent_link: Permanent link
         publish: Udgiv
         publish_settings: Publish settings
-        published: published
         save: Gem
         status: Status
         title: Titel
         type_your_post: Type your post
       index:
+        actions: Actions
         author: Forfatter
+        created_at: Created at
         manage_pages: Administrer sider
         new_page: ny Side
+        text_filter: Text filter
         title: Titel
       new:
         success: New page created
@@ -288,7 +301,9 @@ da:
         cancel: Anuller
         default: Default
         description: Beskrivelse
-        explain: The template name is the filename Publify will look for when calling an article of that type. It should be in your theme under views/articles/template name.html.erb
+        explain: The template name is the filename Publify will look for when calling
+          an article of that type. It should be in your theme under views/articles/template
+          name.html.erb
         name: Navn
         or: or
         post_types: Post Types
@@ -318,7 +333,7 @@ da:
         are_you_sure: Are you sure?
         content_type: Indholdstype (Content Type)
         date: Dato
-        delete: Delete
+        delete: Slet
         file_size: Filstørrelse
         filename: Filnavn
         media_library: Media Library
@@ -334,42 +349,47 @@ da:
         warning: No file selected
     seo:
       general:
-        canonical_url: Canonical Url
         custom_tracking_code: Custom tracking code
         do_not_index_tags: Do not index tags
         dofollow: Dofollow
-        explain: Here you can add anything you want to appear in your application header, such as analytics service tracking code.
-        explain_humans_txt: It's an initiative for knowing the people behind a website. It's a TXT file that contains information about the different people who have contributed to building the website. http://humanstxt.org/
-        explain_moderate_feedback: You may want to moderate feedback when turning this on
-        explain_rss_description: 'You can use the following tags: %author% (author name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url% (a link to the article you want to protect)'
-        explain_tag_index_html: Checking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues
+        explain: Here you can add anything you want to appear in your application
+          header, such as analytics service tracking code.
+        explain_moderate_feedback: You may want to moderate feedback when turning
+          this on
+        explain_rss_description: 'You can use the following tags: %author% (author
+          name), %blog_url% (this blog URL), %blog_name% (this blog title) and %permalink_url%
+          (a link to the article you want to protect)'
+        explain_tag_index_html: Checking this box will add <code>noindex, follow</code>
+          meta tags in every tags page, removing them from search engines and preventing
+          duplicate content issues
         general_settings: Generelle indstillinger
         google: Google
         google_analytics: Google Analytics
-        google_webmaster_tools_validation_link: Google Webmaster Tools validation link
-        human: Human
-        humans_txt: Human
+        google_webmaster_tools_validation_link: Google Webmaster Tools validation
+          link
         indexing: Indexing
         meta_description: Meta description
         meta_keywords: Meta keywords
-        read_more_about_html: Read more about %{link}
         robots_txt: Robots.txt
         rss_description_message: RSS description message
-        this_will_display: This will display at the bottom of each post in the RSS feed
-        use_canonical_url: Use canonical URL
+        this_will_display: This will display at the bottom of each post in the RSS
+          feed
         use_dofollow_in_comments: Use dofollow in comments
         use_meta_keywords: Use meta keywords
         use_rss_description: Use RSS description
       permalinks:
         custom: Custom
         date_and_title: Date and title
-        explain: Publify offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links.
+        explain: Publify offers you the ability to create a custom URL structure for
+          your permalinks and archives. This can improve the aesthetics, usability,
+          and forward-compatibility of your links.
         help_on_permalink_settings: Help on permalink settings
         month_and_title: Month and title
         permalink_format: Permalink format
         sample: Here are some examples to get you started.
         title_only: Title only
-        you_can_custom_your_url_structure: 'You can customize your URL structure using the following tags:'
+        you_can_custom_your_url_structure: 'You can customize your URL structure using
+          the following tags:'
         your_article_day: your article day of publication.
         your_article_month: your article month of publication.
         your_article_slug_html: your article slug. <strong>Using this slug is mandatory</strong>.
@@ -392,30 +412,35 @@ da:
         paginated_archives: Paginated archives
         replaced_by_the_archive_date: Replaced by the archive date
         replaced_by_the_content_body: Replaced by the content body
-        replaced_with_the_article_categories: Replaced with the article categories (comma separated)
+        replaced_with_the_article_categories: Replaced with the article categories
+          (comma separated)
         replaced_with_the_article_page_title: Replaced with the article/page title
         replaced_with_the_article_tags: Replaced with the article tags (comma separated)
         replaced_with_the_category_tag_name: Replaced with the category/tag name
         replaced_with_the_current_date: Replaced with the current date
         replaced_with_the_current_month: Replaced with the current month
         replaced_with_the_current_page_number: Replaced with the current page number
-        replaced_with_the_current_search_phrase: Replaced with the current search phrase
+        replaced_with_the_current_search_phrase: Replaced with the current search
+          phrase
         replaced_with_the_current_time: Replaced with the current time
         replaced_with_the_current_year: Replaced with the current year
         replaced_with_the_post_page_excerpt: Replaced with the post/page excerpt
-        replaced_with_the_title_of_the_article_page: Replaced with the title of the article/page
+        replaced_with_the_title_of_the_article_page: Replaced with the title of the
+          article/page
         search_results: Search results
         short_statuses: Short statuses
         short_statuses_lists: Short statuses lists
         the_blog_s_name: The blog's name
         the_blog_s_tagline_description: The blog's tagline / description
-        these_tags_can_be_included: These tags can be included in your templates and will be replaced when displaying the page.
+        these_tags_can_be_included: These tags can be included in your templates and
+          will be replaced when displaying the page.
         title_template: Title template
     settings:
       display:
         cancel: Anuller
         custom_url: Custom URL shortener domain
-        custom_url_help: If you have a custom domain for URL shortening, enter it here.
+        custom_url_help: If you have a custom domain for URL shortening, enter it
+          here.
         date_format: Date format
         default_archives_show: articles on the archives page
         default_article_show: articles on the homepage
@@ -444,16 +469,24 @@ da:
         enable_feedback_moderation: Aktiver feedback moderation
         enable_recaptcha: Enable reCaptcha
         enable_spam_protection: Aktiver spam beskyttelse
-        explain_feedback_moderation: Du kan slå feedback moderation til for hele bloggen. Hvis du gør dette kommer kommentarer først frem når du har godkendt dem
-        explain_reject_comments: Publify will automatically reject comments which contain over a certain amount of links in them
-        explain_spam_protection: Enabling spam protection will make publify compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots
-        explain_spamfiltering_html: Publify can (optionally) use the <a href='http://akismet.com'>Akismet</a> spam-filtering service.  You need to register with Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here
-        feedback: Feedback
+        explain_feedback_moderation: Du kan slå feedback moderation til for hele bloggen.
+          Hvis du gør dette kommer kommentarer først frem når du har godkendt dem
+        explain_reject_comments: Publify will automatically reject comments which
+          contain over a certain amount of links in them
+        explain_spam_protection: Enabling spam protection will make publify compare
+          the IP address of posters as well as the contents of their posts against
+          local and remote blacklists. Good defense against spam bots
+        explain_spamfiltering_html: Publify can (optionally) use the <a href='http://akismet.com'>Akismet</a>
+          spam-filtering service.  You need to register with Akismet and receive an
+          API key before you can use their service.  If you have an Akismet key, enter
+          it here
+        feedback: Diskussion
         feedback_settings: Feedback settings
         max_links: Max Links
         none: none
         or: or
-        remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside config/initializers/recaptcha.rb
+        remember_to_set_your_recaptcha: Remember to set your reCaptcha keys inside
+          config/initializers/recaptcha.rb
         set_to_0_to_never_disable_comments: Sæt til 0 for at aldrig deaktivere kommentarer
         set_to_0_to_never_reject_comments: Sæt til 0 for at aldrig forkaste kommentarer
         spam: Spam
@@ -465,8 +498,12 @@ da:
         blog_subtitle: Blog undertitel
         blog_url: Blogadresse
         cancel: Anuller
-        email_address_used_to_notify: E-mail adresse der bruges af Publify til at sende meddelelser
-        explain_allow_users_to_register_html: This will allow users to register themselves as contributors, an unprivileged account level which grants them no rights beyond owning a profile on the site. If you don't want users to register, you can add them via <em>Manage users</em> under <em>Settings</em>.
+        email_address_used_to_notify: E-mail adresse der bruges af Publify til at
+          sende meddelelser
+        explain_allow_users_to_register_html: This will allow users to register themselves
+          as contributors, an unprivileged account level which grants them no rights
+          beyond owning a profile on the site. If you don't want users to register,
+          you can add them via <em>Manage users</em> under <em>Settings</em>.
         general_settings: Generelle Indstillinger
         items_to_display_in_admin_lists: Items to display in admin lists
         language: Sprog
@@ -508,9 +545,10 @@ da:
         design: Design
         display: Display
         documentation: Documentation
-        feedback: Feedback
+        feedback: Diskussion
         general_settings: Generelle Indstillinger
         global_seo_settings: Global SEO settings
+        home: Home
         in_page_plugins: In page plugins
         logged_in_as: Logged in as %{login}
         logout_html: Log ud &raquo;
@@ -535,7 +573,8 @@ da:
         write: Write
       twitter_alert:
         fill_the_twitter_credentials: fill in the OAuth credentials
-        how_to_setup_twitter_html: If you want to push short statuses on Twitter, you need to %{twitter_settings_link} Twitter gave you after you %{twitter_registration_link}.
+        how_to_setup_twitter_html: If you want to push short statuses on Twitter,
+          you need to %{twitter_settings_link} Twitter gave you after you %{twitter_registration_link}.
         registered_your_application: registered your application
     sidebar:
       config:
@@ -544,8 +583,14 @@ da:
         you_have_no_plugins_installed: You have no plugins installed
       index:
         cancel: Anuller
-        download_more_plugins_html: You can download and install sidebar plugins from our official <a href='https://github.com/fdv/publify/wiki/Sidebar-plugins'>plugin repository</a>. All you have to do is upload the theme directory in your vendor/plugins directory.
-        explain_how_its_works: Træk og slip for at ændre indholdsoversigten der vises på denne blog. Du kan fjerne elementer fra indholdsoversigten bare ved at klikke fjern. Ændringer gemmes med det samme, men ikke aktiveret, før du klikker på 'Offentliggør' knappen.
+        download_more_plugins_html: You can download and install sidebar plugins from
+          our official <a href='https://github.com/fdv/publify/wiki/Sidebar-plugins'>plugin
+          repository</a>. All you have to do is upload the theme directory in your
+          vendor/plugins directory.
+        explain_how_its_works: Træk og slip for at ændre indholdsoversigten der vises
+          på denne blog. Du kan fjerne elementer fra indholdsoversigten bare ved at
+          klikke fjern. Ændringer gemmes med det samme, men ikke aktiveret, før du
+          klikker på 'Offentliggør' knappen.
         or: or
         publish_changes: Udgiv ændringer
         sidebar: Sidebar
@@ -562,6 +607,7 @@ da:
         no_tags: There are no tags yet. Why don't you create one?
         or: or
         save: Gem
+        view: View
     themes:
       index:
         active_theme: "%{name} - Aktiv tema"
@@ -629,7 +675,7 @@ da:
       no_articles_found: Fandt ingen artikler
     archives_article:
       posted_in: offentliggjort i
-    article:
+    article_author:
       posted_by: Skrevet af
     article_excerpt:
       continue_reading: Continue reading
@@ -649,7 +695,7 @@ da:
       comment_markup_help: Hjælp med kommentar markup
       leave_url_email: leave url/email
       preview_comment: Vis kommentar eksempel
-      your_blog: your blog
+      your_blog: Din Blog
       your_email: Din email
       your_message: Din besked
       your_name: Dit Navn
@@ -674,14 +720,17 @@ da:
       contact_information: Contact information
       jabber: 'Jabber:'
       msn: 'MSN:'
-      this_author_has_not_published_any_article_yet: This author has not published any article yet
+      this_author_has_not_published_any_article_yet: This author has not published
+        any article yet
       twitter: 'Twitter:'
       web_site: 'Web site:'
       yahoo: 'Yahoo:'
   comments:
     comment:
       said: sagde
-      this_comment_has_been_flagged_for_moderator_approval: Denne kommentar er blevet markeret som krævende godkendelse. Den vil ikke blive vist før forfatteren godkender den.
+      this_comment_has_been_flagged_for_moderator_approval: Denne kommentar er blevet
+        markeret som krævende godkendelse. Den vil ikke blive vist før forfatteren
+        godkender den.
   date:
     abbr_month_names:
     - 
@@ -715,17 +764,26 @@ da:
     characters_minimum: Minimum %{min} characters
   errors:
     article_type_already_exist: This article type already exists
-    cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved to be used for feed URLs
+    cant_end_with_rss_or_atom: Can't end in .rss or .atom. These are reserved to be
+      used for feed URLs
     no_notes_found: No notes found...
     no_posts_found: No posts found...
     page_not_found: Page not found
     permalink_need_a_title: 'You need a permalink format with an identifier : %%title%%'
     problem_sending_to_twitter: Oooops something went wrong!
-    render_sidebar: It seems something went wrong. Maybe some of your sidebars are actually missing and you should either reinstall them or remove them manually
-    the_page_you_are_looking_for: The page you are looking for has moved or does not exist.
+    render_sidebar: It seems something went wrong. Maybe some of your sidebars are
+      actually missing and you should either reinstall them or remove them manually
+    the_page_you_are_looking_for: The page you are looking for has moved or does not
+      exist.
   generic:
     change: Change
+    conversation: Conversation
+    delete: Slet
+    edit: Rediger
+    mark_as_ham: Mark as ham
+    mark_as_spam: Mark as spam
     save: Gem
+    short_url: Short url
   helper:
     at: at
   langs:
@@ -763,7 +821,8 @@ da:
     publisher: Blog publisher
   setup:
     article:
-      body: Welcome to Publify. This is your first article. Edit or delete it, then start blogging!'
+      body: Welcome to Publify. This is your first article. Edit or delete it, then
+        start blogging!
       title: Hello World!
     index:
       blog_name: Blog name
@@ -772,7 +831,9 @@ da:
       your_mail: Din email
     page:
       about: About
-      body: This is an example of a Publify page. You can edit this to write information about yourself or your site so readers know who you are. You can create as many pages as this one as you like and manage all of your content inside Publify.
+      body: This is an example of a Publify page. You can edit this to write information
+        about yourself or your site so readers know who you are. You can create as
+        many pages as this one as you like and manage all of your content inside Publify.
   tags:
     index:
       there_are_no_tags: There are no tags