Merge branch 'master' into files_encryption

Conflicts:
	apps/user_ldap/l10n/nn_NO.php
	core/l10n/es.php
	core/l10n/et_EE.php
	core/l10n/ja_JP.php
	core/l10n/nn_NO.php
	l10n/ca/core.po
	l10n/ca/files_external.po
	l10n/ca/settings.po
	l10n/cy_GB/core.po
	l10n/cy_GB/files.po
	l10n/cy_GB/files_encryption.po
	l10n/cy_GB/files_external.po
	l10n/cy_GB/files_sharing.po
	l10n/cy_GB/files_trashbin.po
	l10n/cy_GB/lib.po
	l10n/cy_GB/settings.po
	l10n/de_DE/core.po
	l10n/es/core.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/et_EE/user_ldap.po
	l10n/gl/core.po
	l10n/it/core.po
	l10n/ja_JP/core.po
	l10n/ja_JP/settings.po
	l10n/nn_NO/core.po
	l10n/nn_NO/user_ldap.po
	l10n/pt_BR/core.po
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_trashbin.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
	l10n/zh_TW/files_sharing.po
	settings/l10n/et_EE.php

diff --cc 3rdparty
index a13af72fbe8983686fc47489a750e60319f68ac2,a13af72fbe8983686fc47489a750e60319f68ac2..2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee
--- 1/3rdparty
--- 2/3rdparty
+++ b/3rdparty
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
++Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee

diff --cc apps/files/l10n/et_EE.php
index 64a2f71b2715e74bddebbcf6bc1f6ef563409823,133f461a1242be26ab11a55024546be101eb27e9..0bc1a9293f1ccc27f707b85d2c61eb80a555bb29
--- 1/apps/files/l10n/et_EE.php
--- 2/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@@ -13,9 -13,10 +13,9 @@@
  "Not enough storage available" => "Saadaval pole piisavalt ruumi",
  "Invalid directory." => "Vigane kaust.",
  "Files" => "Failid",
 -"Share" => "Jaga",
  "Delete permanently" => "Kustuta jäädavalt",
  "Delete" => "Kustuta",
- "Rename" => "ümber",
+ "Rename" => "Nimeta ümber",
  "Pending" => "Ootel",
  "{new_name} already exists" => "{new_name} on juba olemas",
  "replace" => "asenda",

diff --cc apps/files_external/l10n/ca.php
Simple merge

diff --cc core/l10n/ca.php
index 91b51d1b31d19f91cbccc111a7377d9aa471a69e,a1430d547f5a9afcc27a233f26893eec5510dff4..e04f5723ce222bf777e9e5613daf0b6183cf5b67
--- 1/core/l10n/ca.php
--- 2/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@@ -88,9 -88,9 +88,11 @@@
  "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
  "ownCloud password reset" => "estableix de nou la contrasenya Owncloud",
  "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
+ "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
+ "Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?",
  "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
 +"Reset email send." => "S'ha enviat el correu reinicialització",
 +"Request failed!" => "El requeriment ha fallat!",
  "Username" => "Nom d'usuari",
  "Request reset" => "Sol·licita reinicialització",
  "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",

diff --cc core/l10n/cy_GB.php
index 4d28ae29a989dde45102a65b37a8940e2d1c13c8,a874d43965d05e5915e0d5c61abd097aae686cc0..d2262dbe243e8147941cf05e00de146fbfeb2af5
--- 1/core/l10n/cy_GB.php
--- 2/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@@ -88,9 -88,9 +88,11 @@@
  "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
  "ownCloud password reset" => "ailosod cyfrinair ownCloud",
  "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+ "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
+ "Request failed!<br>Did you make sure your email/username was right?" => "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost.",
  "You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
 +"Reset email send." => "Ailosod anfon e-bost.",
 +"Request failed!" => "Methodd y cais!",
  "Username" => "Enw defnyddiwr",
  "Request reset" => "Gwneud cais i ailosod",
  "Your password was reset" => "Ailosodwyd eich cyfrinair",

diff --cc core/l10n/de_DE.php
Simple merge

diff --cc core/l10n/gl.php
Simple merge

diff --cc core/l10n/it.php
Simple merge

diff --cc core/l10n/pt_BR.php
Simple merge

diff --cc settings/l10n/ca.php
Simple merge

diff --cc settings/l10n/cy_GB.php
index eea702bde9898bbad9d606ad243481891eaeb26f,7ffcbdb45b5e7f0c776cb47a890e5c082ee6412b..530c4311bb8da28337cf04bd7d9775a780c9d544
--- 1/settings/l10n/cy_GB.php
--- 2/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@@ -2,7 -2,9 +2,8 @@@
  "Authentication error" => "Gwall dilysu",
  "Invalid request" => "Cais annilys",
  "Error" => "Gwall",
 -"Saving..." => "Yn cadw...",
  "undo" => "dadwneud",
+ "Groups" => "Grwpiau",
  "Delete" => "Dileu",
  "Security Warning" => "Rhybudd Diogelwch",
  "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",

diff --cc settings/l10n/ja_JP.php
Simple merge