alchemy_cms 3.2.0.rc1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f8ca76e53123738e5b411666a78d9677f265404
-  data.tar.gz: ffc2be39f4cb1bc85af32c008b8029175fd1b4d8
+  metadata.gz: 843d3c5e682842d297dfa3ac503f46739f0c7923
+  data.tar.gz: 923ddb8430a40163ca1268c1bc8543bbdbac53ef
 SHA512:
-  metadata.gz: e8e351a38eee79090b65c5d1d96d2bd7b1c8ca07aad0f4153554e2f9fbb112e03a92314d7ad975e8451c819b66a267892466346ae3d6e6d4e4f79c64fe1d6b36
-  data.tar.gz: 075c70c688c8b1091e12c3b8f727875c892f7a9e4b3dd2539e23e1004c1799add4bd844f79deb9d17452b9799f4538e0b45e0b32b77b093b06fd0f58b9d6bfde
+  metadata.gz: a21f12882df65fe9f1e4d5ad7381d20c74de29f3dd61e3d532e0c9a4bc3358620849809f63acc239189ded7f286f31c67982d822a77d5ae0eea0925d493a6494
+  data.tar.gz: 76e2ba7f396580a673ec3fc7e7444d8acb7b78828e9dd7dc3c19dc49b958e1e98180a10315a62f25056ebf37384e99fca54d97e9388c57d4dbf957341d6c33d1

data/.gitignore

@@ -19,3 +19,4 @@ spec/dummy/config/locales/**/*
 /index/
 /.bundle/
 .rbenv-version
+.ruby-*

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of AlchemyCMS, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in AlchemyCMS a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+AlchemyCMS maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. AlchemyCMS maintainers who do not follow the Code of Conduct may be removed from the AlchemyCMS team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the AlchemyCMS maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/README.md

@@ -29,7 +29,7 @@ Read more about Alchemy on the [website](http://alchemy-cms.com) and in the [gui
 
 ## Rails Version
 
-**This version of Alchemy CMS runs with Rails 4.2**
+**This version of Alchemy CMS runs with Rails 4.2 only**
 
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
 * For a Rails 3.2 compatible version use the [`2.8-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/2.8-stable).
@@ -54,7 +54,7 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
 Use the installer:
 
 ```shell
-$ gem install alchemy_cms --pre
+$ gem install alchemy_cms
 $ alchemy new my_magicpage
 ```
 

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee

@@ -30,11 +30,6 @@ $.extend Alchemy,
           $(child).attr "data-element-id"
         params_string = ""
         cell_id = $(this).attr("data-cell-id")
-        # Is the trash window open?
-        if Alchemy.TrashWindow.current
-          # update the trash icon
-          if $("#trash_items div.element_editor").not(".dragged").length is 0
-            $("#element_trash_button .icon").removeClass "full"
         $(event.target).css "cursor", "progress"
         params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param(element_ids: ids)
         params_string += "&cell_id=" + cell_id  if cell_id
@@ -82,7 +77,8 @@ $.extend Alchemy,
         iframeFix: "iframe#alchemy_preview_window"
         connectToSortable: cell_classes.replace(/,.$/, "")
         start: (event, ui) ->
-          $(this).hide().addClass "dragged"
-          ui.helper.css width: "300px"
-        stop: ->
-          $(this).show().removeClass "dragged"
+          $(this).hide().addClass("dragged")
+          ui.helper.css("width", "300px")
+        stop: (event, ui) ->
+          $(this).show().removeClass("dragged")
+          ui.helper.css("width", "")

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -20,4 +20,3 @@ Alchemy.GUI =
     Alchemy.ElementDirtyObserver($el)
     Alchemy.GUI.init($el)
     Alchemy.ImageLoader($el)
-    Alchemy.Spinner.watch($el)

data/app/assets/javascripts/alchemy/alchemy.windows.js.coffee

@@ -18,13 +18,25 @@ $.extend Alchemy,
     # Opens the trash window
     open: (page_id, title) ->
       url = Alchemy.routes.admin_trash_path(page_id)
-      Alchemy.TrashWindow.current = new Alchemy.Dialog url,
+      @current = new Alchemy.Dialog url,
         title: title,
         size: '380x460',
         modal: false
-      Alchemy.TrashWindow.current.open()
+      @current.open()
+      return
 
     # Refreshes the trash window
     refresh: ->
-      if Alchemy.TrashWindow.current
-        Alchemy.TrashWindow.current.reload()
+      @current.reload() if @current
+      return
+
+    # Update the trash window icon
+    updateIcon: ->
+      return unless @current?
+      $icon = $("#element_trash_button .icon")
+      # Is the trash window open?
+      if $("#trash_items div.element_editor").not(".dragged").length is 0
+        $icon.removeClass("full")
+      else
+        $icon.addClass("full")
+      return

data/app/assets/stylesheets/alchemy/selects.scss

@@ -28,9 +28,13 @@ select {
 
         b {
           @extend .icon-menu;
-          width: 18px;
-          line-height: 23px;
           background-image: none;
+
+          &:before {
+            position: relative;
+            top: 5px;
+            left: 1px;
+          }
         }
       }
     }
@@ -55,6 +59,11 @@ select {
             line-height: 4px;
             width: 12px;
             font-size: 10px;
+
+            &:before {
+              top: 0px;
+              left: 0px;
+            }
           }
         }
       }
@@ -209,3 +218,18 @@ select {
     margin-right: 2*$default-margin;
   }
 }
+
+// overriding important of select2 default style for retina screens
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
+       only screen and (min-resolution: 2dppx) {
+
+  #alchemy {
+
+    .select2-search input,
+    .select2-search-choice-close,
+    .select2-container .select2-choice abbr,
+    .select2-container .select2-choice .select2-arrow b {
+       background-image: none !important;
+    }
+  }
+}

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -84,7 +84,7 @@ module Alchemy
       end
 
       def order
-        @trashed_elements = Element.trashed.where(id: params[:element_ids]).pluck(:id)
+        @trashed_element_ids = Element.trashed.where(id: params[:element_ids]).pluck(:id)
         Element.transaction do
           params[:element_ids].each_with_index do |element_id, idx|
             # Ensure to set page_id and cell_id to the current page and

data/app/helpers/alchemy/elements_block_helper.rb

@@ -108,15 +108,15 @@ module Alchemy
     #
     def element_view_for(element, options = {})
       options = {
-        :tag   => :div,
-        :id    => element_dom_id(element),
-        :class => element.name,
-        :tags_formatter => lambda { |tags| tags.join(" ") }
+        tag: :div,
+        id: element_dom_id(element),
+        class: element.name,
+        tags_formatter: ->(tags) { tags.join(" ") }
       }.merge(options)
 
       # capture inner template block
       output = capture do
-        yield ElementViewHelper.new(self, :element => element) if block_given?
+        yield ElementViewHelper.new(self, element: element) if block_given?
       end
 
       # wrap output in a useful DOM element
@@ -155,7 +155,7 @@ module Alchemy
       }.merge(options)
 
       capture do
-        yield ElementEditorHelper.new(self, :element => element)
+        yield ElementEditorHelper.new(self, element: element) if block_given?
       end
     end
   end

data/app/models/alchemy/language.rb

@@ -19,6 +19,9 @@
 
 module Alchemy
   class Language < ActiveRecord::Base
+    belongs_to :site
+    has_many :pages
+
     validates_presence_of :name
     validates_presence_of :language_code
     validates_presence_of :page_layout
@@ -26,20 +29,30 @@ module Alchemy
     validates_uniqueness_of :language_code, scope: [:site_id, :country_code]
     validate :presence_of_default_language
     validate :publicity_of_default_language
-    has_many :pages
-    belongs_to :site
-    after_destroy :delete_language_root_page
-    validates_format_of :language_code, with: /\A[a-z]{2}\z/, if: -> { language_code.present? }
-    validates_format_of :country_code, with: /\A[a-z]{2}\z/, if: -> { country_code.present? }
+
+    validates_format_of :language_code, with: /\A[a-z]{2}\z/,
+      if: -> { language_code.present? }
+
+    validates_format_of :country_code, with: /\A[a-z]{2}\z/,
+      if: -> { country_code.present? }
+
+    before_save :remove_old_default,
+      if: -> { default_changed? && self != Language.default }
+
+    after_update :set_pages_language,
+      if: -> { language_code_changed? || country_code_changed? }
+
+    after_update :unpublish_pages,
+      if: -> { changes[:public] == [true, false] }
+
     before_destroy :check_for_default
-    after_update :set_pages_language, if: proc { |m| m.language_code_changed? || m.country_code_changed? }
-    after_update :unpublish_pages, if: proc { changes[:public] == [true, false] }
-    before_save :remove_old_default, if: proc { |m| m.default_changed? && m != Language.default }
+    after_destroy :delete_language_root_page
+
+    default_scope { on_site(Site.current) }
 
     scope :published,      -> { where(public: true) }
     scope :with_root_page, -> { joins(:pages).where(Page.table_name => {language_root: true}) }
     scope :on_site,        ->(s) { s.present? ? where(site_id: s) : all }
-    default_scope { on_site(Site.current) }
 
     class << self
 
@@ -117,7 +130,7 @@ module Alchemy
     end
 
     def check_for_default
-      raise "Default language is not deletable" if self.default?
+      raise DefaultLanguageNotDeletable if default?
     end
 
     def delete_language_root_page
@@ -127,6 +140,5 @@ module Alchemy
     def unpublish_pages
       self.pages.update_all(public: false)
     end
-
   end
 end

data/app/models/alchemy/page/page_naming.rb

@@ -37,8 +37,7 @@ module Alchemy
     # Makes a slug of all ancestors urlnames including mine and delimit them be slash.
     # So the whole path is stored as urlname in the database.
     def update_urlname!
-      names = ancestors.visible.contentpages.where(language_root: nil).map(&:slug).compact
-      new_urlname = (names << slug).join('/')
+      new_urlname = nested_url_name(slug)
       if urlname != new_urlname
         legacy_urls.create(urlname: urlname)
         update_column(:urlname, new_urlname)
@@ -56,6 +55,18 @@ module Alchemy
       "http://#{urlname}"
     end
 
+    # Returns an array of visible/non-language_root ancestors.
+    def visible_ancestors
+      return [] unless parent
+      if new_record?
+        parent.visible_ancestors.tap do |base|
+          base.push(parent) if parent.visible?
+        end
+      else
+        ancestors.visible.contentpages.where(language_root: nil).to_a
+      end
+    end
+
     private
 
     def update_descendants_urlnames
@@ -71,18 +82,15 @@ module Alchemy
     # If url_nesting is enabled the urlname contains the whole path.
     def set_urlname
       if Config.get(:url_nesting)
-        url_name = [
-          parent_urlname,
-          convert_url_name(urlname.blank? ? name : slug)
-        ].compact.join('/')
+        value = slug
       else
-        url_name = convert_url_name(urlname.blank? ? name : urlname)
+        value = urlname
       end
-      write_attribute :urlname, url_name
+      self[:urlname] = nested_url_name(value)
     end
 
     def set_title
-      write_attribute :title, name
+      self[:title] = name
     end
 
     # Converts the given name into an url friendly string.
@@ -90,8 +98,8 @@ module Alchemy
     # Names shorter than 3 will be filled up with dashes,
     # so it does not collidate with the language code.
     #
-    def convert_url_name(name)
-      url_name = convert_to_urlname(name)
+    def convert_url_name(value)
+      url_name = convert_to_urlname(value.blank? ? name : value)
       if url_name.length < 3
         ('-' * (3 - url_name.length)) + url_name
       else
@@ -99,11 +107,16 @@ module Alchemy
       end
     end
 
-    # Urlname of parent page.
-    # Returns nil, if the parent is either a language root page or the root page itself
-    def parent_urlname
-      return if parent.nil? || parent.language_root? || parent.root?
-      parent.urlname
+    def nested_url_name(value)
+      (ancestor_slugs << convert_url_name(value)).join('/')
+    end
+
+    # Slugs of all visible/non-language_root ancestors.
+    # Returns [], if there is no parent, the parent is
+    # the root page itself, or url_nesting is off.
+    def ancestor_slugs
+      return [] if !Config.get(:url_nesting) || parent.nil? || parent.root?
+      visible_ancestors.map(&:slug).compact
     end
   end
 end

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -19,7 +19,6 @@
 <% else -%>
 
   $el.trigger('Alchemy.SelectElementEditor');
-  Alchemy.SelectBox($el);
   Alchemy.Tinymce.init(<%= @element.richtext_contents_ids.to_json %>);
   Alchemy.GUI.initElement($el);
 

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,10 +1,12 @@
 $('#element_area .ajax_folder').show();
 Alchemy.PreviewWindow.refresh();
-<% if @trashed_elements.any? %>
+<% if @trashed_element_ids.any? %>
 Alchemy.growl('<%= _t(:successfully_restored_element) -%>');
-<% element_ids = @trashed_elements.collect { |e| ".dragged[data-element-id=\"#{e.id}\"]" }.join(", ").html_safe %>
-<% @trashed_elements.each do |element| %>
-$('<%= element_ids %>').each(function() { this.id = 'element_' + <%= element.id %> });
+<% element_ids = @trashed_element_ids.collect do |id|
+                   "#element_area [data-element-id=\"#{id}\"]"
+                 end.join(", ").html_safe %>
+<% @trashed_element_ids.each do |id| %>
+$('<%= element_ids %>').each(function() { this.id = 'element_' + <%= id %> });
 <% end %>
 Alchemy.ElementEditors.reinit('<%= element_ids %>');
 <% else %>

data/app/views/alchemy/admin/trash/index.html.erb

@@ -25,4 +25,5 @@
 <%- end -%>
 <script type="text/javascript" charset="utf-8">
   Alchemy.DraggableTrashItems(<%= @draggable_trash_items.to_json.html_safe %>);
+  Alchemy.TrashWindow.updateIcon();
 </script>

data/bin/alchemy

@@ -24,7 +24,7 @@ class AlchemyInstaller < Thor
     say welcome_message, :yellow
     say "Step 1: Creating a Rails #{rails_version} application.", :yellow
     say "Please wait...", :yellow
-    system("rails _#{rails_version}_ new #{@application} -m #{alchemy_template} -d #{options[:database]} -JT --quiet") || exit!(1)
+    system("rails _#{rails_version}_ new #{@application} -m #{alchemy_template} -d #{options[:database]} -T") || exit!(1)
     say "Successfully created the Rails application!", :green
     say instructions, :yellow
     if options[:database] == 'mysql' || options[:database] == 'postgresql'
@@ -57,7 +57,7 @@ class AlchemyInstaller < Thor
   end
 
   def bundle_cmd
-    "cd #{@application} && bundle exec"
+    "cd #{@application} && DISABLE_SPRING=1 bundle exec"
   end
 
   def alchemy_template
@@ -88,7 +88,7 @@ INSTRUCTIONS
   def further_instructions
     <<-EOF
 
-Step 5: Further Instructions
+Step 4: Further Instructions
 
 Change into your app folder:
 

data/config/locales/alchemy.nl.yml

@@ -178,18 +178,18 @@ nl:
     "Currently locked pages": "Vergrendelde pagina's"
     "Default language has to be public": "De standaardpagina moet publiek zijn."
     "Delete image": "Afbeelding verwijderen"
-    "Do you really want to clear the clipboard?": "Klembord zeker leegmaken?"
-    "Do you really want to clear the trash?": "Prullenbak zeker leeg maken?"
-    "Do you really want to delete this content?": "Deze inhoud zeker verwijderen?"
+    "Do you really want to clear the clipboard?": "Klembord echt leeg maken?"
+    "Do you really want to clear the trash?": "Prullenbak echt leeg maken?"
+    "Do you really want to delete this content?": "Inhoud echt verwijderen?"
     "Drag an element over to the element window to restore it": "Sleep een element over het elementenvenster om deze te herstellen"
-    "Edit Picturemask": "Afbeeldingsmaker bewerken"
+    "Edit Picturemask": "Afbeeldingsmasker bewerken"
     "Edit image": "Afbeelding bewerken"
     "Edit multiple pictures": "Meerdere afbeeldingen bewerken"
     "Elements": "Elementen"
     "Element trashed": "Element verwijderd"
     "Error with the Flash® Uploader!": "Fout in de Flash® Uploader!"
     "Excerpt": "fragment"
-    "File uploaded succesfully": "Bestand %{name} geüploadet"
+    "File uploaded succesfully": "Bestand %{name} geüpload"
     "File successfully updated": "Bestand is succesvol geüpdatet"
     "File upload error": "Bestand kon niet worden geüpload: %{error}"
     "File deleted successfully": "%{name} verwijderd"
@@ -231,7 +231,7 @@ nl:
     "Pages order saved": "Paginasortering is opgeslagen"
     "Password": "Wachtwoord"
     "Password reset": "Wachtwoord resetten"
-    "Paste from clipboard": "Uit klembord kopieren"
+    "Paste from clipboard": "Uit klembord kopiëren"
     "Picture infos": "Afbeeldingsinformatie"
     "Picture uploaded succesfully": "Afbeelding %{name} is geüpload"
     "Picture validation error": "Fout bij het uploaden van afbeelding %{name}"
@@ -290,11 +290,11 @@ nl:
     "Welcome to Alchemy": "Welkom bij Alchemy"
     "Who else is online": "Wie is ook online"
     "Yes": "Ja"
-    "You are not authorized": "U bent niet geauthoriseerd."
+    "You are not authorized": "U bent niet geautoriseerd."
     "You are about to edit many pictures at once": "%{length} afbeeldingen worden in een keer aangepast"
     element_dirty_close_window_notice: "Elementen zijn nog niet opgeslagen. Dit venster toch sluiten?"
     "You may upload files with following extensions": "%{file_types_description} mogen worden geüpload met de volgende extensies: %{file_types}"
-    "You may upload any file": "Alle bestanden kunnen worden geüploadet"
+    "You may upload any file": "Alle bestanden kunnen worden geüpload"
     "Your last login was on": "Uw laatste aanmelding was op %{time}."
     "Your last updated pages": "Your last updated pages"
     "Your trash is empty": "De prullenbak is leeg"
@@ -329,11 +329,11 @@ nl:
     content_essence_not_found: "Content essence is niet gevonden"
     content_not_found: "Veld voor content is niet aanwezig"
     content_validations_headline: "Controleer de gemarkeerde velden"
-    copy: "kopieren"
-    copy_element: "Dit element kopieren"
-    copy_page: "Pagina kopieren"
+    copy: "kopiëren"
+    copy_element: "Dit element kopiëren"
+    copy_page: "Pagina kopiëren"
     "Could not delete Pictures": "Kan de afbeeldingen niet verwijderen"
-    copy_language_tree_heading: "Paginastructuur kopieren"
+    copy_language_tree_heading: "Paginastructuur kopiëren"
     country_code_placeholder: 'bijv. us (optioneel)'
     country_code_foot_note: "Een landcode is alleen nodig voor het toewijzen van een aparte taal aan elk land."
     create: "maken"
@@ -347,25 +347,25 @@ nl:
     delete_image: "Deze afbeelding verwijderen"
     delete_language: "Deze taal verwijderen"
     delete_page: "Deze pagina verwijderen"
-    delete_tag: 'Tag löschen'
+    delete_tag: 'Tag wissen'
     document: "Bestand"
     documents: "Bestanden"
     download_csv: "CSV downloaden"
     download_file: "Bestand '%{filename}' downloaden"
-    do_you_really_want_to_delete_this_tag?: "Do you really want to delete this tag?"
+    do_you_really_want_to_delete_this_tag?: "Wilt u deze tag echt verwijderen?"
     drag_to_sort: "slepen om afbeeldingen te sorteren"
     edit_file_properties: "Eigenschappen van het bestand aanpassen"
     edit_image_properties: "Eigenschappen van de afbeelding aanpassen"
     edit_language: "Taal aanpassen"
     edit_page: "Pagina aanpassen"
     edit_page_properties: "Eigenschappen van de pagina aanpassen"
-    edit_tag: 'Tag bearbeiten'
+    edit_tag: 'Tag bewerken'
     edit_selected_pictures: "Geselecteerde afbeeldingen aanpassen"
     element_editor_not_found: "Foutmelding in het element"
     element_of_type: "Element"
     element_saved: "Opgeslagen element."
     enter_external_link: "Voer de URL van de snelkoppeling in"
-    explain_cropping: "<p>Verplaats het frame en verander de grootte om de uitsnede aan te passen.</p><p>Klik op apply als het goed is.</p>"
+    explain_cropping: "<p>Verplaats het frame en verander de grootte om de uitsnede aan te passen.</p><p>Klik op 'toepassen' als het goed is.</p>"
     explain_publishing: "Pagina publiceren en gecachede versie van de server verwijderen."
     explain_sitemap_dragndrop_sorting: "Tip: Versleep de pagina's met het icoon om ze te sorteren."
     explain_unlocking: "Pagina verlaten en ontgrendelen voor andere gebruikers."
@@ -373,7 +373,7 @@ nl:
       footnote: "HINT! Gebruik de CTRL knop (of CMD voor OSX) om meerdere %{name} te uploaden."
       intro: "Zo werkt het uploaden van %{name}."
       step1: "Klik op 'browse' en ga naar de %{name} map"
-      step2: "Selecteer alle %{name} die je wilt uploaden"
+      step2: "Selecteer alle %{name} die u wilt uploaden"
       step3: "Klik op 'open'."
       dragndrop: "Of sleep de bestanden op onderstaande vlak"
     external_link_notice_1: "Voer de complete URL in (inclusief bijvoorbeeld http://)"
@@ -406,19 +406,19 @@ nl:
     image_title: "Titel-tag"
     images: "Bilder"
     internal_link_headline: "Kies een pagina om een snelkoppeling naar te maken."
-    internal_link_page_elements_explanation: "Additionally you can click right beside a page on 'Show Elements' to link to an anchor of an element from that page."
-    internal_link_page_anchors_explanation: "Alternativly you can link to an anchor of the actual page."
-    "item copied to clipboard": "%{name} naar het klembord gekopieerd"
+    internal_link_page_elements_explanation: "Ook kunt u rechts klikken op een pagina in 'Toon Elementen' om naar een interne verwijzing (anchor) van deze pagina te verwijzen."
+    internal_link_page_anchors_explanation: "Ook kunt u naar de pagina zelf verwijzen."
+    "item copied to clipboard": "%{name} naar het klembord gekopiëerd"
     "item moved to clipboard": "%{name} naar het klembord verplaatst"
     "item removed from clipboard": "%{name} van het klembord verwijderd"
     javascript_disabled_headline: "Javascript is uitgeschakeld!"
-    javascript_disabled_text: "Javascript is nodig voor een juiste werking van Alchemy. Gebruik de browseringstellingen om Javascript in te schakelen."
+    javascript_disabled_text: "Javascript is nodig voor een juiste werking van Alchemy. Gebruik de browserinstellingen om Javascript in te schakelen."
     language_code_placeholder: 'bijv. en'
     language_does_not_exist: "Deze boomstructuur bestaat niet."
     language_pages_copied: "Boomstructuur gekopieerd."
     last_upload_only: "Alleen de laatste upload"
     left: "links"
-    legacy_url_info_text: "A link is a redirect from an old URL to the current URL of this page. This redirect happens with a <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
+    legacy_url_info_text: "Een link is een omleiding van een historische URL naar de huidige URL van deze pagina. Deze omleiding gebeurt met een <a href='https://support.google.com/webmasters/answer/93633' target='_blank'>301 status code</a>."
     link_image: "Snelkoppeling naar deze afbeelding maken."
     link_overlay_tab_label:
       contactform: "Contactformulier"
@@ -489,7 +489,7 @@ nl:
     page_type: "Type"
     page_visible_in_navigation: "Zichtbaar in navigatie"
     page_was_created: "Is aangemaakt"
-    page_was_updated: "Is geüpdated"
+    page_was_updated: "Is geüpdatet"
     pages:
       update:
         comma_seperated: "Komma gescheiden"
@@ -556,7 +556,7 @@ nl:
     title: "Titel"
     to_alchemy: "Naar Alchemy"
     "trash element": "Element naar de prullenbak verplaatsen"
-    unknown: "unknown"
+    unknown: "onbekend"
     unlink: "Snelkoppeling van deze afbeelding verwijderen."
     unlock_page: "Pagina verlaten"
     unlocked_page: "pagina %{name} is ontgrendeld."
@@ -565,8 +565,8 @@ nl:
     url_name: "URL-Naam"
     visible: "zichtbaar"
     want_to_create_new_language: "Nieuwe boomstructuur aanmaken?"
-    want_to_make_copy_of_existing_language: "Een boomstructuur kopieren?"
-    "We need at least one default.": "Er moet een standarad taal zijn."
+    want_to_make_copy_of_existing_language: "Een boomstructuur kopiëren?"
+    "We need at least one default.": "Er moet minimaal één standaard taal zijn."
     welcome_note: "Welkom %{name}"
     welcome_back_note: "Welkom terug %{name}"
     welcome_please_identify_notice: "Welkom! voer uw gegevens in."
@@ -576,7 +576,7 @@ nl:
     zoom_image: "Afbeelding vergroten"
     "Leave Alchemy": "Alchemy verlaten"
     leave: "Afmelden"
-    "You are about to leave Alchemy": "U staat op het punt de NVM Regiosite te verlaten"
+    "You are about to leave Alchemy": "U staat op het punt Alchemy te verlaten"
     "Do you want to": "Wilt u"
     "stay logged in": "ingelogd blijven"
     "or to completely": "of compleet"
@@ -631,15 +631,15 @@ nl:
     distance_in_words:
       half_a_minute: "halve minuut"
       less_than_x_seconds:
-        zero: 'weniger als 1 Sekunde'
+        zero: 'minder dan nul seconden'
         one:  "minder dan 1 seconde"
         many: "minder dan %{count} seconden"
       x_seconds:
         one:  "1 seconde"
         many: "%{count} seconden"
       less_than_x_minutes:
-        zero: 'weniger als 1 Minute'
-        one:  "minder dan een minuut"
+        zero: 'minder dan nul minuten'
+        one:  "minder dan één minuut"
         many: "minder dan %{count} minuten"
       x_minutes:
         one:  "1 minuut"
@@ -857,9 +857,9 @@ nl:
         link_title: Link-Titel
         css_class: Stijl
         link_target: Link-Doel
-        render_size: Rendergrootte
-        crop_from: Crop van
-        crop_size: Cropgrotte
+        render_size: Weergavegrootte
+        crop_from: Uitsnede uit
+        crop_size: Grootte van uitsnede
         picture_id: Afbeelding
 
       alchemy/language:
@@ -880,12 +880,12 @@ nl:
         locked: "Deze pagina is geblokkeerd door een andere gebruiker."
         locked_by: "geblokkeerd door"
         meta_description: "Omschrijving"
-        meta_keywords: "Keywords"
+        meta_keywords: "Sleutelwoorden"
         name: "Naam"
         page_layout: "Paginatype"
         public: "publiek"
         restricted: "afgeschermd"
-        robot_follow: "robot mag links volgen"
+        robot_follow: "robot mag URL's volgen"
         robot_index: "robot mag index volgen"
         sitemap: "zichtbaar in sitemap"
         tag_list: Tags