Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command

* owncloud/master: (238 commits)
  Change visibility of scanner internals
  [tx-robot] updated from transifex
  remove legacy OC_Filesystem being used in a hook callback
  add title property to share dialog
  forgotten infobox messages translations
  reverts 188c543 and translates only mail
  fix warning text and margin
  Adjust core apps to use "requiremin" instead of "require"
  Added requiremin/requiremax fields for apps
  [tx-robot] updated from transifex
  unwrapped strings fix
  allow resharing of files with only share permissions
  don't lose file size during rename
  drop superflous statement in phpdoc
  add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
  [tx-robot] updated from transifex
  fix grammar
  make user_ldap fully translatable
  [tx-robot] updated from transifex
  fix typo
  ...

Conflicts:
	core/register_command.php

1 files changed, 6 insertions, 3 deletions

diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 961866fc158..0270a65f3a0 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Yes" => "Ja",
 "No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with user or group …" => "Delen met gebruiker of groep ...",
 "Share link" => "Deel link",
+"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+"By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen",
 "Password protect" => "Wachtwoord beveiligd",
-"Password" => "Wachtwoord",
+"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
 "Allow Public Upload" => "Sta publieke uploads toe",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
+"Password" => "Wachtwoord",
 "Storage & database" => "Opslag & database",
 "Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de database",