summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/l10n/es.js4
-rw-r--r--lib/l10n/es.json4
-rw-r--r--lib/l10n/gl.js4
-rw-r--r--lib/l10n/gl.json4
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php5
5 files changed, 20 insertions, 1 deletions
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 82d5d6081c2..80b64b79a3c 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -30,6 +30,10 @@ OC.L10N.register(
"Server version %s or higher is required." : "Se necesita la versión %s o superior del servidor.",
"Server version %s or lower is required." : "Se necesita la versión %s o inferior del servidor. ",
"Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
+ "Remote wipe started" : "Barrido remoto comenzado.",
+ "A remote wipe was started on device %s" : "Se ha iniciado un barrido remoto en el dispositivo %s.",
+ "Remote wipe finished" : "Barrido remoto finalizado",
+ "The remote wipe on %s has finished" : "El barrido remoto en %s ha finalizado",
"Unknown filetype" : "Tipo de archivo desconocido",
"Invalid image" : "Imagen inválida",
"Avatar image is not square" : "La imagen de avatar no es cuadrada",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 226bc8f9792..f6d3a078732 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -28,6 +28,10 @@
"Server version %s or higher is required." : "Se necesita la versión %s o superior del servidor.",
"Server version %s or lower is required." : "Se necesita la versión %s o inferior del servidor. ",
"Logged in user must be an admin" : "El usuario registrado debe ser un administrador",
+ "Remote wipe started" : "Barrido remoto comenzado.",
+ "A remote wipe was started on device %s" : "Se ha iniciado un barrido remoto en el dispositivo %s.",
+ "Remote wipe finished" : "Barrido remoto finalizado",
+ "The remote wipe on %s has finished" : "El barrido remoto en %s ha finalizado",
"Unknown filetype" : "Tipo de archivo desconocido",
"Invalid image" : "Imagen inválida",
"Avatar image is not square" : "La imagen de avatar no es cuadrada",
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index 1c38703cfa1..ca580dcbff7 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -30,6 +30,10 @@ OC.L10N.register(
"Server version %s or higher is required." : "Requírese a versión %s ou superior do servidor.",
"Server version %s or lower is required." : "Requírese a versión %s ou inferior do servidor.",
"Logged in user must be an admin" : "O usuario registrado debe ser un administrador",
+ "Remote wipe started" : "Iniciouse a limpeza remota",
+ "A remote wipe was started on device %s" : "Iniciouse unha limpeza remota no dispositivo %s",
+ "Remote wipe finished" : "Rematou a limpeza remota",
+ "The remote wipe on %s has finished" : "A limpeza remota en %s rematou",
"Unknown filetype" : "Tipo de ficheiro descoñecido",
"Invalid image" : "Imaxe incorrecta",
"Avatar image is not square" : "A imaxe do avatar non é un cadrado",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 852ef456abc..d9344090fec 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -28,6 +28,10 @@
"Server version %s or higher is required." : "Requírese a versión %s ou superior do servidor.",
"Server version %s or lower is required." : "Requírese a versión %s ou inferior do servidor.",
"Logged in user must be an admin" : "O usuario registrado debe ser un administrador",
+ "Remote wipe started" : "Iniciouse a limpeza remota",
+ "A remote wipe was started on device %s" : "Iniciouse unha limpeza remota no dispositivo %s",
+ "Remote wipe finished" : "Rematou a limpeza remota",
+ "The remote wipe on %s has finished" : "A limpeza remota en %s rematou",
"Unknown filetype" : "Tipo de ficheiro descoñecido",
"Invalid image" : "Imaxe incorrecta",
"Avatar image is not square" : "A imaxe do avatar non é un cadrado",
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index b2bb6d706e0..4cd25878ec5 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -65,6 +65,9 @@ trait S3ConnectionTrait {
$this->params = $params;
}
+ public function getBucket() {
+ return $this->bucket;
+ }
/**
* Returns the connection
@@ -72,7 +75,7 @@ trait S3ConnectionTrait {
* @return S3Client connected client
* @throws \Exception if connection could not be made
*/
- protected function getConnection() {
+ public function getConnection() {
if (!is_null($this->connection)) {
return $this->connection;
}