Merge branch 'master' into share_api

Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php

4 files changed, 33 insertions, 0 deletions

diff --git a/apps/files_sharing/l10n/.gitkeep b/apps/files_sharing/l10n/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/apps/files_sharing/l10n/.gitkeep
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
new file mode 100644
index 00000000000..02d554c7f5d
--- /dev/null
+++ b/apps/files_sharing/l10n/ca.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Els vostres fitxers compartits",
+"Item" => "Element",
+"Shared With" => "Compartit amb",
+"Permissions" => "Permisos",
+"Read" => "Llegeix",
+"Edit" => "Edita",
+"Delete" => "Elimina",
+"Enable Resharing" => "Permet compartir amb tercers",
+"Allow users to reshare files they don't own" => "Permet als usuaris compartir fitxers que no són seus"
+);
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
new file mode 100644
index 00000000000..e087d4a293a
--- /dev/null
+++ b/apps/files_sharing/l10n/pl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Twoje udostępnione pliki",
+"Item" => "Element",
+"Shared With" => "Udostępnione dla",
+"Permissions" => "Uprawnienia",
+"Read" => "Odczyt",
+"Edit" => "Edycja",
+"Delete" => "Usuń",
+"Enable Resharing" => "Włącz ponowne udostępnianie",
+"Allow users to reshare files they don't own" => "Zezwalaj użytkownikom na ponowne udostępnienie plików, które są im udostępnione"
+);
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
new file mode 100644
index 00000000000..8eb48c3b6de
--- /dev/null
+++ b/apps/files_sharing/l10n/sv.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Your Shared Files" => "Dina delade filer",
+"Item" => "Objekt",
+"Shared With" => "Delad med",
+"Permissions" => "Rättigheter",
+"Read" => "Läsa",
+"Edit" => "Ändra",
+"Delete" => "Radera",
+"Enable Resharing" => "Aktivera dela vidare",
+"Allow users to reshare files they don't own" => "Tillåter användare att dela filer som dom inte äger"
+);