Merge branch 'master' into patch-1

Author: linuzer

apps/files/l10n/ar.js

@@ -241,6 +241,7 @@ OC.L10N.register(
     "Files settings" : "إعدادات الملفات",
     "File cannot be accessed" : "الملف لم يمكن الوصول إليه",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "إمّا أن الملف غير موجود أو أنك لا تمتلك الصلاحية لعرضه. أُطلُب من المُرسل أن يتشاركه معك.",
+    "Your files" : "ملفاتك",
     "Open in files" : "إفتَح في شاشة الملفات",
     "Sort favorites first" : "فرز المفضلات أولا",
     "Sort folders before files" : "فرز المجلدات قبل الملفات",
@@ -294,6 +295,8 @@ OC.L10N.register(
     "Create new templates folder" : "إنشيْ مجلد جديد للقوالب",
     "Templates" : "القوالب",
     "New template folder" : "مجلد القوالب الجديد",
+    "In folder" : "في المجلد",
+    "Search in folder: {folder}" : "البحث في المجلد:  {folder}",
     "One of the dropped files could not be processed" : "أحد الملفات المُفلَتة لا يمكن معالجته",
     "Uploading \"{filename}\" failed" : "فشل في تحديث \"{filename}\" ",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدان","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلدات"],

apps/files/l10n/ar.json

@@ -239,6 +239,7 @@
     "Files settings" : "إعدادات الملفات",
     "File cannot be accessed" : "الملف لم يمكن الوصول إليه",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "إمّا أن الملف غير موجود أو أنك لا تمتلك الصلاحية لعرضه. أُطلُب من المُرسل أن يتشاركه معك.",
+    "Your files" : "ملفاتك",
     "Open in files" : "إفتَح في شاشة الملفات",
     "Sort favorites first" : "فرز المفضلات أولا",
     "Sort folders before files" : "فرز المجلدات قبل الملفات",
@@ -292,6 +293,8 @@
     "Create new templates folder" : "إنشيْ مجلد جديد للقوالب",
     "Templates" : "القوالب",
     "New template folder" : "مجلد القوالب الجديد",
+    "In folder" : "في المجلد",
+    "Search in folder: {folder}" : "البحث في المجلد:  {folder}",
     "One of the dropped files could not be processed" : "أحد الملفات المُفلَتة لا يمكن معالجته",
     "Uploading \"{filename}\" failed" : "فشل في تحديث \"{filename}\" ",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدان","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلدات"],

apps/files/l10n/ca.js

@@ -241,6 +241,7 @@ OC.L10N.register(
     "Files settings" : "Paràmetres de Fitxers",
     "File cannot be accessed" : "No es pot accedir al fitxer",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "No s'ha trobat el fitxer o no teniu permisos per a visualitzar-lo. Demaneu al remitent que el comparteixi.",
+    "Your files" : "Els vostres fitxers",
     "Open in files" : "Obre a Fitxers",
     "Sort favorites first" : "Ordena primer els preferits",
     "Sort folders before files" : "Ordena les carpetes abans dels fitxers",
@@ -294,6 +295,8 @@ OC.L10N.register(
     "Create new templates folder" : "Crea la carpeta de plantilles",
     "Templates" : "Plantilles",
     "New template folder" : "Carpeta de plantilles nova",
+    "In folder" : "En la carpeta",
+    "Search in folder: {folder}" : "Cerca en la carpeta: {folder}",
     "One of the dropped files could not be processed" : "No s'ha pogut processar un dels fitxers que heu deixat anar.",
     "Uploading \"{filename}\" failed" : "No s'ha pogut pujar «{filename}»",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],

apps/files/l10n/ca.json

@@ -239,6 +239,7 @@
     "Files settings" : "Paràmetres de Fitxers",
     "File cannot be accessed" : "No es pot accedir al fitxer",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "No s'ha trobat el fitxer o no teniu permisos per a visualitzar-lo. Demaneu al remitent que el comparteixi.",
+    "Your files" : "Els vostres fitxers",
     "Open in files" : "Obre a Fitxers",
     "Sort favorites first" : "Ordena primer els preferits",
     "Sort folders before files" : "Ordena les carpetes abans dels fitxers",
@@ -292,6 +293,8 @@
     "Create new templates folder" : "Crea la carpeta de plantilles",
     "Templates" : "Plantilles",
     "New template folder" : "Carpeta de plantilles nova",
+    "In folder" : "En la carpeta",
+    "Search in folder: {folder}" : "Cerca en la carpeta: {folder}",
     "One of the dropped files could not be processed" : "No s'ha pogut processar un dels fitxers que heu deixat anar.",
     "Uploading \"{filename}\" failed" : "No s'ha pogut pujar «{filename}»",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],

apps/files/l10n/de_DE.js

@@ -241,6 +241,7 @@ OC.L10N.register(
     "Files settings" : "Dateien-Einstellungen",
     "File cannot be accessed" : "Auf die Datei kann nicht zugegriffen werden",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "Die Datei konnte nicht gefunden werden oder Sie haben keine Berechtigungen, um sie anzuzeigen. Bitten Sie den Absender, die Datei zu teilen.",
+    "Your files" : "Ihre Dateien",
     "Open in files" : "In Dateien öffnen",
     "Sort favorites first" : "Favoriten zuerst sortieren",
     "Sort folders before files" : "Ordner vor Dateien sortieren",
@@ -294,6 +295,8 @@ OC.L10N.register(
     "Create new templates folder" : "Neuen Vorlagenordner erstellen",
     "Templates" : "Vorlagen",
     "New template folder" : "Neuer Vorlagenordner",
+    "In folder" : "Im Ordner",
+    "Search in folder: {folder}" : "Im Ordner suchen: {folder}",
     "One of the dropped files could not be processed" : "Eine der abgelegten Dateien konnte nicht verarbeitet werden",
     "Uploading \"{filename}\" failed" : "Fehler beim Hochladen von \"{filename}\"",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],

apps/files/l10n/de_DE.json

@@ -239,6 +239,7 @@
     "Files settings" : "Dateien-Einstellungen",
     "File cannot be accessed" : "Auf die Datei kann nicht zugegriffen werden",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "Die Datei konnte nicht gefunden werden oder Sie haben keine Berechtigungen, um sie anzuzeigen. Bitten Sie den Absender, die Datei zu teilen.",
+    "Your files" : "Ihre Dateien",
     "Open in files" : "In Dateien öffnen",
     "Sort favorites first" : "Favoriten zuerst sortieren",
     "Sort folders before files" : "Ordner vor Dateien sortieren",
@@ -292,6 +293,8 @@
     "Create new templates folder" : "Neuen Vorlagenordner erstellen",
     "Templates" : "Vorlagen",
     "New template folder" : "Neuer Vorlagenordner",
+    "In folder" : "Im Ordner",
+    "Search in folder: {folder}" : "Im Ordner suchen: {folder}",
     "One of the dropped files could not be processed" : "Eine der abgelegten Dateien konnte nicht verarbeitet werden",
     "Uploading \"{filename}\" failed" : "Fehler beim Hochladen von \"{filename}\"",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],

apps/files/l10n/en_GB.js

@@ -241,6 +241,7 @@ OC.L10N.register(
     "Files settings" : "Files settings",
     "File cannot be accessed" : "File cannot be accessed",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "The file could not be found or you do not have permissions to view it. Ask the sender to share it.",
+    "Your files" : "Your files",
     "Open in files" : "Open in files",
     "Sort favorites first" : "Sort favourites first",
     "Sort folders before files" : "Sort folders before files",
@@ -294,6 +295,8 @@ OC.L10N.register(
     "Create new templates folder" : "Create new templates folder",
     "Templates" : "Templates",
     "New template folder" : "New template folder",
+    "In folder" : "In folder",
+    "Search in folder: {folder}" : "Search in folder: {folder}",
     "One of the dropped files could not be processed" : "One of the dropped files could not be processed",
     "Uploading \"{filename}\" failed" : "Uploading \"{filename}\" failed",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],

apps/files/l10n/en_GB.json

@@ -239,6 +239,7 @@
     "Files settings" : "Files settings",
     "File cannot be accessed" : "File cannot be accessed",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "The file could not be found or you do not have permissions to view it. Ask the sender to share it.",
+    "Your files" : "Your files",
     "Open in files" : "Open in files",
     "Sort favorites first" : "Sort favourites first",
     "Sort folders before files" : "Sort folders before files",
@@ -292,6 +293,8 @@
     "Create new templates folder" : "Create new templates folder",
     "Templates" : "Templates",
     "New template folder" : "New template folder",
+    "In folder" : "In folder",
+    "Search in folder: {folder}" : "Search in folder: {folder}",
     "One of the dropped files could not be processed" : "One of the dropped files could not be processed",
     "Uploading \"{filename}\" failed" : "Uploading \"{filename}\" failed",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],

apps/files/l10n/fr.js

@@ -241,6 +241,7 @@ OC.L10N.register(
     "Files settings" : "Paramètres de Fichiers",
     "File cannot be accessed" : "Impossible d'accéder au fichier",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "Le fichier n'a pas été trouv ou vous n'avez pas les permissions pour le voir. Demandez à l'expéditeur de le partager.",
+    "Your files" : "Vos fichiers",
     "Open in files" : "Ouvrir dans Fichiers",
     "Sort favorites first" : "Trier les favoris d'abord",
     "Sort folders before files" : "Trier les dossiers avant les fichiers",
@@ -275,6 +276,7 @@ OC.L10N.register(
     "(copy %n)" : "(copier %n)",
     "Move cancelled" : "Déplacement annulé",
     "A file or folder with that name already exists in this folder" : "Un fichier ou un dossier portant ce nom existe déjà dans ce dossier",
+    "The files are locked" : "Les fichiers sont verrouillés",
     "The file does not exist anymore" : "Le fichier n'existe plus",
     "Choose destination" : "Choisir la destination",
     "Copy to {target}" : "Copier vers {target}",
@@ -293,6 +295,8 @@ OC.L10N.register(
     "Create new templates folder" : "Créer un nouveau dossier de modèles",
     "Templates" : "Modèles",
     "New template folder" : "Nouveau modèle de dossier",
+    "In folder" : "Dans le dossier",
+    "Search in folder: {folder}" : "Rechercher dans le dossier : {folder}",
     "One of the dropped files could not be processed" : "L'un des fichiers déposés n'a pas pu être traité",
     "Uploading \"{filename}\" failed" : "Le téléversement de « {filename} » a échoué",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],

apps/files/l10n/fr.json

@@ -239,6 +239,7 @@
     "Files settings" : "Paramètres de Fichiers",
     "File cannot be accessed" : "Impossible d'accéder au fichier",
     "The file could not be found or you do not have permissions to view it. Ask the sender to share it." : "Le fichier n'a pas été trouv ou vous n'avez pas les permissions pour le voir. Demandez à l'expéditeur de le partager.",
+    "Your files" : "Vos fichiers",
     "Open in files" : "Ouvrir dans Fichiers",
     "Sort favorites first" : "Trier les favoris d'abord",
     "Sort folders before files" : "Trier les dossiers avant les fichiers",
@@ -273,6 +274,7 @@
     "(copy %n)" : "(copier %n)",
     "Move cancelled" : "Déplacement annulé",
     "A file or folder with that name already exists in this folder" : "Un fichier ou un dossier portant ce nom existe déjà dans ce dossier",
+    "The files are locked" : "Les fichiers sont verrouillés",
     "The file does not exist anymore" : "Le fichier n'existe plus",
     "Choose destination" : "Choisir la destination",
     "Copy to {target}" : "Copier vers {target}",
@@ -291,6 +293,8 @@
     "Create new templates folder" : "Créer un nouveau dossier de modèles",
     "Templates" : "Modèles",
     "New template folder" : "Nouveau modèle de dossier",
+    "In folder" : "Dans le dossier",
+    "Search in folder: {folder}" : "Rechercher dans le dossier : {folder}",
     "One of the dropped files could not be processed" : "L'un des fichiers déposés n'a pas pu être traité",
     "Uploading \"{filename}\" failed" : "Le téléversement de « {filename} » a échoué",
     "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],