diff options
Diffstat (limited to 'apps/files_external')
74 files changed, 422 insertions, 136 deletions
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php index 003665486f8..e8ed8950c3a 100644 --- a/apps/files_external/appinfo/app.php +++ b/apps/files_external/appinfo/app.php @@ -70,7 +70,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array( OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array( 'backend' => 'FTP', 'configuration' => array( - 'host' => (string)$l->t('URL'), + 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'root' => '&'.$l->t('Root'), @@ -108,7 +108,7 @@ if (!OC_Util::runningOnWindows()) { OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array( 'backend' => 'SMB / CIFS', 'configuration' => array( - 'host' => (string)$l->t('URL'), + 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'share' => (string)$l->t('Share'), @@ -118,7 +118,7 @@ if (!OC_Util::runningOnWindows()) { OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array( 'backend' => (string)$l->t('SMB / CIFS using OC login'), 'configuration' => array( - 'host' => (string)$l->t('URL'), + 'host' => (string)$l->t('Host'), 'username_as_share' => '!'.$l->t('Username as share'), 'share' => '&'.$l->t('Share'), 'root' => '&'.$l->t('Root')), @@ -148,7 +148,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array( OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array( 'backend' => 'SFTP', 'configuration' => array( - 'host' => (string)$l->t('URL'), + 'host' => (string)$l->t('Host'), 'user' => (string)$l->t('Username'), 'password' => '*'.$l->t('Password'), 'root' => '&'.$l->t('Root')))); diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php index 5bef941c19c..eb1150eb95e 100644 --- a/apps/files_external/l10n/ar.php +++ b/apps/files_external/l10n/ar.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "المكان", -"URL" => "عنوان الموقع", +"Host" => "المضيف", "Username" => "إسم المستخدم", "Password" => "كلمة السر", "Share" => "شارك", +"URL" => "عنوان الموقع", "Saved" => "حفظ", "Folder name" => "اسم المجلد", "Options" => "خيارات", diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php index add49819154..faf0388dd91 100644 --- a/apps/files_external/l10n/ast.php +++ b/apps/files_external/l10n/ast.php @@ -2,16 +2,69 @@ $TRANSLATIONS = array( "Local" => "Llocal", "Location" => "Llocalización", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Key" => "Clave", +"Secret" => "Secretu", +"Bucket" => "Depósitu", +"Amazon S3 and compliant" => "Amazon S3 y compatibilidá", +"Access Key" => "Clave d'accesu", +"Secret Key" => "Clave Secreta", +"Hostname (optional)" => "Nome d'equipu (opcional)", +"Port (optional)" => "Puertu (opcional)", +"Region (optional)" => "Rexón (opcional)", +"Enable SSL" => "Habilitar SSL", +"Enable Path Style" => "Habilitar Estilu de ruta", +"App key" => "App principal", +"App secret" => "App secreta", +"Host" => "Sirvidor", "Username" => "Nome d'usuariu", "Password" => "Contraseña", +"Root" => "Raíz", +"Secure ftps://" => "Secure ftps://", +"Client ID" => "ID de veceru", +"Client secret" => "Veceru secretu", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Username (required)" => "Nome d'usuariu (necesariu)", +"Bucket (required)" => "Depósitu (necesariu)", +"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)", +"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)", +"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilín (necesariu pa OpenStack Object Storage)", +"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)", +"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)", +"Timeout of HTTP requests in seconds (optional)" => "Tiempu d'espera de peticiones HTTP en segundos (opcional)", "Share" => "Compartir", +"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC", +"Username as share" => "Nome d'usuariu como Compartición", +"URL" => "URL", +"Secure https://" => "Secure https://", +"Remote subfolder" => "Subcarpeta remota", +"Access granted" => "Accesu concedíu", +"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox", +"Grant access" => "Conceder accesu", +"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.", +"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive", "Saved" => "Guardáu", +"<b>Note:</b> " => "<b>Nota:</b> ", +" and " => "y", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.", +"External Storage" => "Almacenamientu esternu", "Folder name" => "Nome de la carpeta", +"External storage" => "Almacenamientu esternu", "Configuration" => "Configuración", "Options" => "Opciones", +"Available for" => "Disponible pa", +"Add storage" => "Amestar almacenamientu", +"No user or group" => "Nengún usuariu o grupu", +"All Users" => "Tolos usuarios", "Groups" => "Grupos", "Users" => "Usuarios", -"Delete" => "Desaniciar" +"Delete" => "Desaniciar", +"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu", +"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu", +"SSL root certificates" => "Certificaos raíz SSL", +"Import Root Certificate" => "Importar certificáu raíz" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php index 0969184383e..13e43314bda 100644 --- a/apps/files_external/l10n/bg_BG.php +++ b/apps/files_external/l10n/bg_BG.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "Място", -"URL" => "Уеб адрес", "Username" => "Потребител", "Password" => "Парола", "Share" => "Споделяне", +"URL" => "Уеб адрес", "Access granted" => "Достъпът е даден", "Grant access" => "Даване на достъп", "External Storage" => "Външно хранилище", diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php index 3b1978a568c..f1ada4b476d 100644 --- a/apps/files_external/l10n/bn_BD.php +++ b/apps/files_external/l10n/bn_BD.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "াবস্থান", -"URL" => "URL", +"Host" => "হোস্ট", "Username" => "ব্যবহারকারী", "Password" => "কূটশব্দ", "Share" => "ভাগাভাগি কর", +"URL" => "URL", "Access granted" => "অধিগমনের অনুমতি প্রদান করা হলো", "Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ", "Grant access" => "অধিগমনের অনুমতি প্রদান কর", diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php index e49f26c353c..e349dfe45ef 100644 --- a/apps/files_external/l10n/ca.php +++ b/apps/files_external/l10n/ca.php @@ -2,10 +2,11 @@ $TRANSLATIONS = array( "Local" => "Local", "Location" => "Ubicació", -"URL" => "URL", +"Host" => "Equip remot", "Username" => "Nom d'usuari", "Password" => "Contrasenya", "Share" => "Comparteix", +"URL" => "URL", "Access granted" => "S'ha concedit l'accés", "Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox", "Grant access" => "Concedeix accés", diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php index 4cfefbde052..2d1116ed0f6 100644 --- a/apps/files_external/l10n/cs_CZ.php +++ b/apps/files_external/l10n/cs_CZ.php @@ -13,17 +13,19 @@ $TRANSLATIONS = array( "Enable SSL" => "Povolit SSL", "App key" => "Klíč aplikace", "App secret" => "Tajemství aplikace", -"URL" => "URL", +"Host" => "Počítač", "Username" => "Uživatelské jméno", "Password" => "Heslo", "Root" => "Root", "Secure ftps://" => "Zabezpečené ftps://", +"Username (required)" => "Uživatelské jméno (nutné)", "Region (optional for OpenStack Object Storage)" => "Region (nepovinný pro OpenStack Object Storage)", "Password (required for OpenStack Object Storage)" => "Heslo (vyžadováno pro OpenStack Object Storage)", "Timeout of HTTP requests in seconds (optional)" => "Vypršení HTTP požadavků v sekundách (nepovinné)", "Share" => "Sdílet", "SMB / CIFS using OC login" => "SMB / CIFS za použití OC loginu", "Username as share" => "Uživatelské jméno jako sdílený adresář", +"URL" => "URL", "Secure https://" => "Zabezpečené https://", "Remote subfolder" => "Vzdálený podadresář", "Access granted" => "Přístup povolen", diff --git a/apps/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php index 9b5d97a48a7..39822fcd383 100644 --- a/apps/files_external/l10n/cy_GB.php +++ b/apps/files_external/l10n/cy_GB.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "Lleoliad", -"URL" => "URL", "Username" => "Enw defnyddiwr", "Password" => "Cyfrinair", "Share" => "Rhannu", +"URL" => "URL", "Groups" => "Grwpiau", "Users" => "Defnyddwyr", "Delete" => "Dileu" diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php index a0e8510789e..2d235747ad9 100644 --- a/apps/files_external/l10n/da.php +++ b/apps/files_external/l10n/da.php @@ -6,7 +6,7 @@ $TRANSLATIONS = array( "Key" => "Nøgle", "Secret" => "Hemmelighed", "Secret Key" => "Hemmelig Nøgle ", -"URL" => "URL", +"Host" => "Host", "Username" => "Brugernavn", "Password" => "Kodeord", "Root" => "Root", @@ -15,6 +15,7 @@ $TRANSLATIONS = array( "Client secret" => "Klient hemmelighed", "OpenStack Object Storage" => "OpenStack Object Storage", "Share" => "Del", +"URL" => "URL", "Secure https://" => "Sikker https://", "Access granted" => "Adgang godkendt", "Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads", diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php index c41cef968f0..03f6f05abb9 100644 --- a/apps/files_external/l10n/de.php +++ b/apps/files_external/l10n/de.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Pfad-Stil aktivieren", "App key" => "App-Schlüssel", "App secret" => "Geheime Zeichenkette der App", -"URL" => "URL", +"Host" => "Host", "Username" => "Benutzername", "Password" => "Passwort", "Root" => "Root", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Teilen", "SMB / CIFS using OC login" => "´", "Username as share" => "Benutzername als Freigabe", +"URL" => "URL", "Secure https://" => "Sicherer HTTPS://", "Remote subfolder" => "Remote-Unterordner:", "Access granted" => "Zugriff gestattet", diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php index 6d7366fe284..4e0ac1f3a09 100644 --- a/apps/files_external/l10n/de_CH.php +++ b/apps/files_external/l10n/de_CH.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Ort", -"URL" => "URL", +"Host" => "Host", "Username" => "Benutzername", "Password" => "Passwort", "Share" => "Freigeben", +"URL" => "URL", "Access granted" => "Zugriff gestattet", "Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox", "Grant access" => "Zugriff gestatten", diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php index 1119a0f8755..286250f8689 100644 --- a/apps/files_external/l10n/de_DE.php +++ b/apps/files_external/l10n/de_DE.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Pfad-Stil aktivieren", "App key" => "App-Schlüssel", "App secret" => "Geheime Zeichenkette der App", -"URL" => "URL", +"Host" => "Host", "Username" => "Benutzername", "Password" => "Passwort", "Root" => "Root", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Teilen", "SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)", "Username as share" => "Benutzername als Freigabe", +"URL" => "URL", "Secure https://" => "Sicherer HTTPS://", "Remote subfolder" => "Remote-Unterordner:", "Access granted" => "Zugriff gestattet", diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php index 351468a36dc..09d39a9e3cd 100644 --- a/apps/files_external/l10n/el.php +++ b/apps/files_external/l10n/el.php @@ -2,23 +2,53 @@ $TRANSLATIONS = array( "Local" => "Τοπικός", "Location" => "Τοποθεσία", -"URL" => "URL", +"Key" => "Κλειδί", +"Secret" => "Μυστικό", +"Access Key" => "Κλειδί πρόσβασης", +"Secret Key" => "Μυστικό κλειδί", +"Hostname (optional)" => "Όνομα μηχανήματος (προαιρετικά)", +"Port (optional)" => "Πόρτα (προαιρετικά)", +"Region (optional)" => "Περιοχή (προαιρετικά)", +"Enable SSL" => "Ενεργοποίηση SSL", +"Enable Path Style" => "Ενεργοποίηση μορφής διαδρομής", +"App key" => "Κλειδί εφαρμογής", +"Host" => "Διακομιστής", "Username" => "Όνομα χρήστη", "Password" => "Κωδικός πρόσβασης", +"Root" => "Root", +"Secure ftps://" => "Ασφαλής ftps://", +"Client ID" => "ID πελάτη", +"Client secret" => "Μυστικό πελάτη", +"OpenStack Object Storage" => "Αποθήκη αντικειμένων OpenStack", "Username (required)" => "Όνομα χρήστη (απαιτείται)", +"Region (optional for OpenStack Object Storage)" => "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)", +"API Key (required for Rackspace Cloud Files)" => "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)", +"Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)", +"Service Name (required for OpenStack Object Storage)" => "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)", +"Timeout of HTTP requests in seconds (optional)" => "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα (προαιρετικά)", "Share" => "Διαμοιράστε", +"SMB / CIFS using OC login" => "SMB / CIFS χρησιμοποιώντας λογαριασμό OC", +"URL" => "URL", +"Secure https://" => "Ασφαλής σύνδεση https://", +"Remote subfolder" => "Απομακρυσμένος υποφάκελος", "Access granted" => "Προσβαση παρασχέθηκε", "Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ", "Grant access" => "Παροχή πρόσβασης", "Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.", "Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ", "Saved" => "Αποθηκεύτηκαν", +"<b>Note:</b> " => "<b>Σημείωση:</b> ", " and " => "και", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο", "Folder name" => "Όνομα φακέλου", "External storage" => "Εξωτερική αποθήκευση", "Configuration" => "Ρυθμίσεις", "Options" => "Επιλογές", +"Available for" => "Διαθέσιμο για", "Add storage" => "Προσθηκη αποθηκευσης", "No user or group" => "Μη διαθέσιμος χρήστης ή ομάδα", "All Users" => "Όλοι οι Χρήστες", diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php index 5a0e2456ac0..d4229c607ef 100644 --- a/apps/files_external/l10n/en_GB.php +++ b/apps/files_external/l10n/en_GB.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Enable Path Style", "App key" => "App key", "App secret" => "App secret", -"URL" => "URL", +"Host" => "Host", "Username" => "Username", "Password" => "Password", "Root" => "Root", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Share", "SMB / CIFS using OC login" => "SMB / CIFS using OC login", "Username as share" => "Username as share", +"URL" => "URL", "Secure https://" => "Secure https://", "Remote subfolder" => "Remote subfolder", "Access granted" => "Access granted", diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php index d8915b49b02..d3ca5a5addf 100644 --- a/apps/files_external/l10n/eo.php +++ b/apps/files_external/l10n/eo.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Loko", -"URL" => "URL", +"Host" => "Gastigo", "Username" => "Uzantonomo", "Password" => "Pasvorto", "Share" => "Kunhavigi", +"URL" => "URL", "Access granted" => "Alirpermeso donita", "Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox", "Grant access" => "Doni alirpermeson", diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php index 3c18b18057e..bbbe0a8c613 100644 --- a/apps/files_external/l10n/es.php +++ b/apps/files_external/l10n/es.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Habilitar Estilo de Ruta", "App key" => "App principal", "App secret" => "App secreta", -"URL" => "URL", +"Host" => "Servidor", "Username" => "Nombre de usuario", "Password" => "Contraseña", "Root" => "Raíz", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Compartir", "SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC", "Username as share" => "Nombre de Usuario como compartir", +"URL" => "URL", "Secure https://" => "Secure https://", "Remote subfolder" => "Subcarpeta remota", "Access granted" => "Acceso concedido", diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php index c380c6d0d91..dfb53d9a784 100644 --- a/apps/files_external/l10n/es_AR.php +++ b/apps/files_external/l10n/es_AR.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Ubicación", -"URL" => "URL", +"Host" => "Servidor", "Username" => "Nombre de usuario", "Password" => "Contraseña", "Share" => "Compartir", +"URL" => "URL", "Access granted" => "Acceso permitido", "Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox", "Grant access" => "Permitir acceso", diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php index 73ce8359104..7e28798f58a 100644 --- a/apps/files_external/l10n/es_MX.php +++ b/apps/files_external/l10n/es_MX.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Ubicación", -"URL" => "URL", +"Host" => "Servidor", "Username" => "Nombre de usuario", "Password" => "Contraseña", "Share" => "Compartir", +"URL" => "URL", "Access granted" => "Acceso concedido", "Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox", "Grant access" => "Conceder acceso", diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php index e5fc7c6937e..73444411979 100644 --- a/apps/files_external/l10n/et_EE.php +++ b/apps/files_external/l10n/et_EE.php @@ -2,10 +2,11 @@ $TRANSLATIONS = array( "Local" => "Kohalik", "Location" => "Asukoht", -"URL" => "URL", +"Host" => "Host", "Username" => "Kasutajanimi", "Password" => "Parool", "Share" => "Jaga", +"URL" => "URL", "Access granted" => "Ligipääs on antud", "Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel", "Grant access" => "Anna ligipääs", diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php index 5b287917864..ef29ba04848 100644 --- a/apps/files_external/l10n/eu.php +++ b/apps/files_external/l10n/eu.php @@ -1,26 +1,36 @@ <?php $TRANSLATIONS = array( +"Local" => "Bertakoa", "Location" => "Kokapena", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Port (optional)" => "Portua (hautazkoa)", +"Enable SSL" => "Gaitu SSL", +"Host" => "Hostalaria", "Username" => "Erabiltzaile izena", "Password" => "Pasahitza", "Share" => "Partekatu", +"URL" => "URL", "Access granted" => "Sarrera baimendua", "Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean", "Grant access" => "Baimendu sarrera", "Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua", "Error configuring Google Drive storage" => "Errore bat egon da Google Drive biltegiratzea konfiguratzean", +"Saved" => "Gordeta", +"<b>Note:</b> " => "<b>Oharra:</b>", +" and " => "eta", "External Storage" => "Kanpoko Biltegiratzea", "Folder name" => "Karpetaren izena", "External storage" => "Kanpoko biltegiratzea", "Configuration" => "Konfigurazioa", "Options" => "Aukerak", "Add storage" => "Gehitu biltegiratzea", +"No user or group" => "Talde edo erabiltzailerik ez", "All Users" => "Erabiltzaile guztiak", "Groups" => "Taldeak", "Users" => "Erabiltzaileak", "Delete" => "Ezabatu", "Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea", +"Allow users to mount the following external storage" => "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen", "SSL root certificates" => "SSL erro ziurtagiriak", "Import Root Certificate" => "Inportatu Erro Ziurtagiria" ); diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php index 6bf8ce8af58..674a7287332 100644 --- a/apps/files_external/l10n/fa.php +++ b/apps/files_external/l10n/fa.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "محل", -"URL" => "آدرس", +"Host" => "میزبانی", "Username" => "نام کاربری", "Password" => "گذرواژه", "Share" => "اشتراکگذاری", +"URL" => "آدرس", "Access granted" => "مجوز دسترسی صادر شد", "Error configuring Dropbox storage" => "خطا به هنگام تنظیم فضای دراپ باکس", "Grant access" => " مجوز اعطا دسترسی", diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php index 9efc8e09cb7..aa7fb394d4e 100644 --- a/apps/files_external/l10n/fi_FI.php +++ b/apps/files_external/l10n/fi_FI.php @@ -6,11 +6,13 @@ $TRANSLATIONS = array( "Port (optional)" => "Portti (valinnainen)", "Region (optional)" => "Alue (valinnainen)", "Enable SSL" => "Käytä SSL:ää", -"URL" => "Verkko-osoite", +"Host" => "Isäntä", "Username" => "Käyttäjätunnus", "Password" => "Salasana", "Username (required)" => "Käyttäjätunnus (vaaditaan)", "Share" => "Jaa", +"URL" => "Verkko-osoite", +"Secure https://" => "Salattu https://", "Access granted" => "Pääsy sallittu", "Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä", "Grant access" => "Salli pääsy", diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php index c03a2f49e0a..df2f63ec2e7 100644 --- a/apps/files_external/l10n/fr.php +++ b/apps/files_external/l10n/fr.php @@ -4,11 +4,23 @@ $TRANSLATIONS = array( "Location" => "Emplacement", "Amazon S3" => "Amazon S3", "Key" => "Clé", +"Secret" => "Secret", "Access Key" => "Clé d'accès", -"URL" => "URL", +"Secret Key" => "Clé secrète", +"Hostname (optional)" => "Nom machine (optionnel)", +"Port (optional)" => "Port (optionnel)", +"Enable SSL" => "Activer SSL", +"App key" => "Clé App", +"Host" => "Hôte", "Username" => "Nom d'utilisateur", "Password" => "Mot de passe", +"Root" => "Root", +"Client ID" => "ID Client", +"Username (required)" => "Nom d'utilisation (requis)", +"API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)", +"Password (required for OpenStack Object Storage)" => "Mot de passe (requis pour OpenStack Object Storage)", "Share" => "Partager", +"URL" => "URL", "Access granted" => "Accès autorisé", "Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox", "Grant access" => "Autoriser l'accès", diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php index ccbdcce7f34..248afb5f6a7 100644 --- a/apps/files_external/l10n/gl.php +++ b/apps/files_external/l10n/gl.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Activar o estilo de ruta", "App key" => "Clave da API", "App secret" => "Secreto do aplicativo", -"URL" => "URL", +"Host" => "Servidor", "Username" => "Nome de usuario", "Password" => "Contrasinal", "Root" => "Root (raíz)", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Compartir", "SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC", "Username as share" => "Nome de usuario como compartición", +"URL" => "URL", "Secure https://" => "https:// seguro", "Remote subfolder" => "Subcartafol remoto", "Access granted" => "Concedeuse acceso", diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php index 67cbb0cba2a..f55a35fcade 100644 --- a/apps/files_external/l10n/he.php +++ b/apps/files_external/l10n/he.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "מיקום", -"URL" => "כתובת", +"Host" => "מארח", "Username" => "שם משתמש", "Password" => "סיסמא", "Share" => "שיתוף", +"URL" => "כתובת", "Access granted" => "הוענקה גישה", "Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox", "Grant access" => "הענקת גישה", diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php index 831bd69c231..d9c570d68c9 100644 --- a/apps/files_external/l10n/hu_HU.php +++ b/apps/files_external/l10n/hu_HU.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Hely", -"URL" => "URL", +"Host" => "Kiszolgáló", "Username" => "Felhasználónév", "Password" => "Jelszó", "Share" => "Megosztás", +"URL" => "URL", "Access granted" => "Érvényes hozzáférés", "Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani", "Grant access" => "Megadom a hozzáférést", diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php index 844af213d8b..978003e20cb 100644 --- a/apps/files_external/l10n/ia.php +++ b/apps/files_external/l10n/ia.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "Loco", -"URL" => "URL", "Username" => "Nomine de usator", "Password" => "Contrasigno", "Share" => "Compartir", +"URL" => "URL", "Folder name" => "Nomine de dossier", "Groups" => "Gruppos", "Users" => "Usatores", diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php index 4d33e6b450c..a21ea7aef7b 100644 --- a/apps/files_external/l10n/id.php +++ b/apps/files_external/l10n/id.php @@ -1,26 +1,44 @@ <?php $TRANSLATIONS = array( +"Local" => "Lokal", "Location" => "lokasi", -"URL" => "tautan", +"Amazon S3" => "Amazon S3", +"Hostname (optional)" => "Hostname (tambahan)", +"Port (optional)" => "Port (tambahan)", +"Region (optional)" => "Wilayah (tambahan)", +"Enable SSL" => "Aktifkan SSL", +"Host" => "Host", "Username" => "Nama Pengguna", "Password" => "Sandi", +"Root" => "Root", +"Username (required)" => "Nama pengguna (dibutuhkan)", "Share" => "Bagikan", +"URL" => "tautan", "Access granted" => "Akses diberikan", "Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox", "Grant access" => "Berikan hak akses", "Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.", "Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive", +"Saved" => "Disimpan", +"<b>Note:</b> " => "<b>Catatan:</b> ", +" and " => "dan", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.", "External Storage" => "Penyimpanan Eksternal", "Folder name" => "Nama folder", "External storage" => "Penyimpanan eksternal", "Configuration" => "Konfigurasi", "Options" => "Opsi", +"Available for" => "Tersedia untuk", "Add storage" => "Tambahkan penyimpanan", +"No user or group" => "Tidak ada pengguna dan grup", "All Users" => "Semua Pengguna", "Groups" => "Grup", "Users" => "Pengguna", "Delete" => "Hapus", "Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna", +"Allow users to mount the following external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut", "SSL root certificates" => "Sertifikat root SSL", "Import Root Certificate" => "Impor Sertifikat Root" ); diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php index 39b750189dc..daf9c4cb441 100644 --- a/apps/files_external/l10n/is.php +++ b/apps/files_external/l10n/is.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Staðsetning", -"URL" => "URL", +"Host" => "Netþjónn", "Username" => "Notendanafn", "Password" => "Lykilorð", "Share" => "Deila", +"URL" => "URL", "Access granted" => "Aðgengi veitt", "Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði", "Grant access" => "Veita aðgengi", diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php index bc5b9d6dcee..c6428a27ba1 100644 --- a/apps/files_external/l10n/it.php +++ b/apps/files_external/l10n/it.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Abilita stile percorsi", "App key" => "Chiave applicazione", "App secret" => "Segreto applicazione", -"URL" => "URL", +"Host" => "Host", "Username" => "Nome utente", "Password" => "Password", "Root" => "Radice", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Condividi", "SMB / CIFS using OC login" => "SMB / CIFS utilizzando le credenziali di OC", "Username as share" => "Nome utente come condivisione", +"URL" => "URL", "Secure https://" => "Sicuro https://", "Remote subfolder" => "Sottocartella remota", "Access granted" => "Accesso consentito", diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php index 4ac746caa00..b70dd2a09a4 100644 --- a/apps/files_external/l10n/ja.php +++ b/apps/files_external/l10n/ja.php @@ -2,21 +2,60 @@ $TRANSLATIONS = array( "Local" => "ローカル", "Location" => "位置", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Key" => "キー", +"Secret" => "シークレットキー", +"Bucket" => "バケット名", +"Amazon S3 and compliant" => "Amazon S3 と互換ストレージ", +"Access Key" => "アクセスキー", +"Secret Key" => "シークレットキー", +"Hostname (optional)" => "ホスト名 (オプション)", +"Port (optional)" => "ポート (オプション)", +"Region (optional)" => "リージョン (オプション)", +"Enable SSL" => "SSLを有効", +"Enable Path Style" => "パス形式を有効", +"App key" => "アプリキー", +"App secret" => "アプリシークレット", +"Host" => "ホスト", "Username" => "ユーザー名", "Password" => "パスワード", +"Root" => "ルート", +"Secure ftps://" => "Secure ftps://", +"Client ID" => "クライアントID", +"Client secret" => "クライアント秘密キー", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Username (required)" => "ユーザー名 (必須)", +"Bucket (required)" => "バケット (必須)", +"Region (optional for OpenStack Object Storage)" => "リージョン (OpenStack Object Storage用のオプション)", +"API Key (required for Rackspace Cloud Files)" => "APIキー (Rackspace Cloud Filesに必須)", +"Tenantname (required for OpenStack Object Storage)" => "テナント名 (OpenStack Object Storage用に必要)", +"Password (required for OpenStack Object Storage)" => "パスワード (OpenStack Object Storage用に必要)", +"Service Name (required for OpenStack Object Storage)" => "サービス名 (OpenStack Object Storage用に必要)", +"URL of identity endpoint (required for OpenStack Object Storage)" => "識別用エンドポイントURL (OpenStack Object Storage用に必要)", +"Timeout of HTTP requests in seconds (optional)" => "HTTPリクエストのタイムアウト秒数 (オプション)", "Share" => "共有", +"SMB / CIFS using OC login" => "owncloudログインで SMB/CIFSを使用", +"Username as share" => "共有名", +"URL" => "URL", +"Secure https://" => "セキュア https://", +"Remote subfolder" => "リモートサブフォルダ", "Access granted" => "アクセスは許可されました", "Error configuring Dropbox storage" => "Dropboxストレージの設定エラー", "Grant access" => "アクセスを許可", "Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力してください。", "Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー", "Saved" => "保存されました", +"<b>Note:</b> " => "<b>注意:</b> ", +" and " => "と", +"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。", +"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。", +"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。", "External Storage" => "外部ストレージ", "Folder name" => "フォルダー名", "External storage" => "外部ストレージ", "Configuration" => "設定", "Options" => "オプション", +"Available for" => "以下が利用可能", "Add storage" => "ストレージを追加", "No user or group" => "ユーザーもしくはグループがありません", "All Users" => "すべてのユーザー", diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php index f7eb01ba94a..a87c8b4879a 100644 --- a/apps/files_external/l10n/ka_GE.php +++ b/apps/files_external/l10n/ka_GE.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "ადგილმდებარეობა", -"URL" => "URL", +"Host" => "ჰოსტი", "Username" => "მომხმარებლის სახელი", "Password" => "პაროლი", "Share" => "გაზიარება", +"URL" => "URL", "Access granted" => "დაშვება მინიჭებულია", "Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს", "Grant access" => "დაშვების მინიჭება", diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php index aac63370245..da17fac1bff 100644 --- a/apps/files_external/l10n/km.php +++ b/apps/files_external/l10n/km.php @@ -1,12 +1,22 @@ <?php $TRANSLATIONS = array( "Location" => "ទីតាំង", -"URL" => "URL", +"Host" => "ម៉ាស៊ីនផ្ទុក", "Username" => "ឈ្មោះអ្នកប្រើ", "Password" => "ពាក្យសម្ងាត់", "Share" => "ចែករំលែក", +"URL" => "URL", +"Access granted" => "បានទទួលសិទ្ធិចូល", +"Error configuring Dropbox storage" => "កំហុសការកំណត់សណ្ឋាននៃឃ្លាំងផ្ទុក Dropbox", +"Grant access" => "ទទួលសិទ្ធិចូល", +"Saved" => "បានរក្សាទុក", +"External Storage" => "ឃ្លាំងផ្ទុកខាងក្រៅ", "Folder name" => "ឈ្មោះថត", +"External storage" => "ឃ្លាំងផ្ទុកខាងក្រៅ", +"Configuration" => "ការកំណត់សណ្ឋាន", "Options" => "ជម្រើស", +"Add storage" => "បន្ថែមឃ្លាំងផ្ទុក", +"All Users" => "អ្នកប្រើទាំងអស់", "Groups" => "ក្រុ", "Users" => "អ្នកប្រើ", "Delete" => "លុប" diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php index 1df20b80725..631f95bc7b9 100644 --- a/apps/files_external/l10n/ko.php +++ b/apps/files_external/l10n/ko.php @@ -1,15 +1,18 @@ <?php $TRANSLATIONS = array( "Location" => "장소", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Host" => "호스트", "Username" => "사용자 이름", "Password" => "암호", "Share" => "공유", +"URL" => "URL", "Access granted" => "접근 허가됨", "Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류", "Grant access" => "접근 권한 부여", "Please provide a valid Dropbox app key and secret." => "올바른 Dropbox 앱 키와 암호를 입력하십시오.", "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류", +"Saved" => "저장됨", "External Storage" => "외부 저장소", "Folder name" => "폴더 이름", "External storage" => "외부 저장소", diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php index 72cc813352e..3d5a3dd0d32 100644 --- a/apps/files_external/l10n/ku_IQ.php +++ b/apps/files_external/l10n/ku_IQ.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "شوێن", -"URL" => "ناونیشانی بهستهر", "Username" => "ناوی بهکارهێنهر", "Password" => "وشەی تێپەربو", "Share" => "هاوبەشی کردن", +"URL" => "ناونیشانی بهستهر", "Folder name" => "ناوی بوخچه", "Users" => "بهكارهێنهر" ); diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php index 49517e7af3d..233b3f81051 100644 --- a/apps/files_external/l10n/lb.php +++ b/apps/files_external/l10n/lb.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Uert", -"URL" => "URL", +"Host" => "Host", "Username" => "Benotzernumm", "Password" => "Passwuert", "Share" => "Deelen", +"URL" => "URL", "Folder name" => "Dossiers Numm:", "Groups" => "Gruppen", "Users" => "Benotzer", diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php index 736becc58d5..908abcc7488 100644 --- a/apps/files_external/l10n/lt_LT.php +++ b/apps/files_external/l10n/lt_LT.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Vieta", -"URL" => "URL", +"Host" => "Mazgas", "Username" => "Prisijungimo vardas", "Password" => "Slaptažodis", "Share" => "Dalintis", +"URL" => "URL", "Access granted" => "Priėjimas suteiktas", "Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą", "Grant access" => "Suteikti priėjimą", diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php index 3506e55323a..5234bda7dce 100644 --- a/apps/files_external/l10n/lv.php +++ b/apps/files_external/l10n/lv.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Vieta", -"URL" => "URL", +"Host" => "Resursdators", "Username" => "Lietotājvārds", "Password" => "Parole", "Share" => "Dalīties", +"URL" => "URL", "Access granted" => "Piešķirta pieeja", "Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi", "Grant access" => "Piešķirt pieeju", diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php index 0a72b65168a..e1bf57d5b93 100644 --- a/apps/files_external/l10n/mk.php +++ b/apps/files_external/l10n/mk.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Локација", -"URL" => "Адреса", +"Host" => "Домаќин", "Username" => "Корисничко име", "Password" => "Лозинка", "Share" => "Сподели", +"URL" => "Адреса", "Access granted" => "Пристапот е дозволен", "Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox", "Grant access" => "Дозволи пристап", diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php index 789527e4a49..e19ec499780 100644 --- a/apps/files_external/l10n/ms_MY.php +++ b/apps/files_external/l10n/ms_MY.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "Lokasi", -"URL" => "URL", "Username" => "Nama pengguna", "Password" => "Kata laluan", "Share" => "Kongsi", +"URL" => "URL", "Groups" => "Kumpulan", "Users" => "Pengguna", "Delete" => "Padam" diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php index f1f0a09fd53..7897f4b3f8d 100644 --- a/apps/files_external/l10n/nb_NO.php +++ b/apps/files_external/l10n/nb_NO.php @@ -3,10 +3,11 @@ $TRANSLATIONS = array( "Local" => "Lokal", "Location" => "Sted", "Amazon S3" => "Amazon S3", -"URL" => "URL", +"Host" => "Tjener", "Username" => "Brukernavn", "Password" => "Passord", "Share" => "Del", +"URL" => "URL", "Access granted" => "Tilgang innvilget", "Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring", "Grant access" => "Gi tilgang", diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php index 2e88c187404..2bdc047e96d 100644 --- a/apps/files_external/l10n/nl.php +++ b/apps/files_external/l10n/nl.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Activeren pad stijl", "App key" => "App key", "App secret" => "App secret", -"URL" => "URL", +"Host" => "Host", "Username" => "Gebruikersnaam", "Password" => "Wachtwoord", "Root" => "Root", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Share", "SMB / CIFS using OC login" => "SMB / CIFS via OC inlog", "Username as share" => "Gebruikersnaam als share", +"URL" => "URL", "Secure https://" => "Secure https://", "Remote subfolder" => "Externe submap", "Access granted" => "Toegang toegestaan", diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php index 542d3ec0421..0ee80369eec 100644 --- a/apps/files_external/l10n/nn_NO.php +++ b/apps/files_external/l10n/nn_NO.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Stad", -"URL" => "Nettstad", +"Host" => "Tenar", "Username" => "Brukarnamn", "Password" => "Passord", "Share" => "Del", +"URL" => "Nettstad", "Folder name" => "Mappenamn", "Configuration" => "Innstillingar", "Groups" => "Grupper", diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php index e854c9f25ae..bd5c98ca051 100644 --- a/apps/files_external/l10n/oc.php +++ b/apps/files_external/l10n/oc.php @@ -1,10 +1,10 @@ <?php $TRANSLATIONS = array( "Location" => "Plaça", -"URL" => "URL", "Username" => "Non d'usancièr", "Password" => "Senhal", "Share" => "Parteja", +"URL" => "URL", "Groups" => "Grops", "Users" => "Usancièrs", "Delete" => "Escafa" diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php index 9c13371b166..74d9347b606 100644 --- a/apps/files_external/l10n/pl.php +++ b/apps/files_external/l10n/pl.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Włącz styl ścieżki", "App key" => "Klucz aplikacji", "App secret" => "Hasło aplikacji", -"URL" => "URL", +"Host" => "Host", "Username" => "Nazwa użytkownika", "Password" => "Hasło", "Root" => "Root", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Udostępnij", "SMB / CIFS using OC login" => "SMB / CIFS przy użyciu loginu OC", "Username as share" => "Użytkownik jako zasób", +"URL" => "URL", "Secure https://" => "Bezpieczny https://", "Remote subfolder" => "Zdalny podfolder", "Access granted" => "Dostęp do", diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php index d9544ae1597..b027a92e50e 100644 --- a/apps/files_external/l10n/pt_BR.php +++ b/apps/files_external/l10n/pt_BR.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Habilitar Estilo do Caminho", "App key" => "Chave do Aplicativo", "App secret" => "Segredo da Aplicação", -"URL" => "URL", +"Host" => "Servidor", "Username" => "Nome de Usuário", "Password" => "Senha", "Root" => "Raiz", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Compartilhar", "SMB / CIFS using OC login" => "SMB / CIFS usando OC logon", "Username as share" => "Nome de usuário como compartilhado", +"URL" => "URL", "Secure https://" => "https:// segura", "Remote subfolder" => "Subpasta remota", "Access granted" => "Acesso concedido", diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php index 767ddeec8a6..2daa72715ba 100644 --- a/apps/files_external/l10n/pt_PT.php +++ b/apps/files_external/l10n/pt_PT.php @@ -12,7 +12,7 @@ $TRANSLATIONS = array( "Enable SSL" => "Activar SSL", "App key" => "Chave da aplicação", "App secret" => "Chave secreta da aplicação", -"URL" => "URL", +"Host" => "Endereço", "Username" => "Nome de utilizador", "Password" => "Palavra-passe", "Root" => "Raiz", @@ -20,6 +20,7 @@ $TRANSLATIONS = array( "Client secret" => "Segredo do cliente", "Username (required)" => "Utilizador (requerido)", "Share" => "Partilhar", +"URL" => "URL", "Remote subfolder" => "Sub-pasta remota ", "Access granted" => "Acesso autorizado", "Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox", diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php index cc48e20ab08..d5e1e90c54a 100644 --- a/apps/files_external/l10n/ro.php +++ b/apps/files_external/l10n/ro.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Locație", -"URL" => "URL", +"Host" => "Gazdă", "Username" => "Nume utilizator", "Password" => "Parolă", "Share" => "Partajează", +"URL" => "URL", "Access granted" => "Acces permis", "Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox", "Grant access" => "Permite accesul", diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php index be1307a9e6b..6aded8e9a31 100644 --- a/apps/files_external/l10n/ru.php +++ b/apps/files_external/l10n/ru.php @@ -1,10 +1,12 @@ <?php $TRANSLATIONS = array( +"Local" => "Локально", "Location" => "Местоположение", -"URL" => "Ссылка", +"Host" => "Сервер", "Username" => "Имя пользователя", "Password" => "Пароль", "Share" => "Открыть доступ", +"URL" => "Ссылка", "Access granted" => "Доступ предоставлен", "Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox", "Grant access" => "Предоставление доступа", diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php index 908f82d8ee9..960ededaa63 100644 --- a/apps/files_external/l10n/si_LK.php +++ b/apps/files_external/l10n/si_LK.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "ස්ථානය", -"URL" => "URL", +"Host" => "සත්කාරකය", "Username" => "පරිශීලක නම", "Password" => "මුර පදය", "Share" => "බෙදා හදා ගන්න", +"URL" => "URL", "Access granted" => "පිවිසීමට හැක", "Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්යාස කිරීමේ දෝශයක් ඇත", "Grant access" => "පිවිසුම ලබාදෙන්න", diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php index e30b007c3cb..f576d92cdac 100644 --- a/apps/files_external/l10n/sk_SK.php +++ b/apps/files_external/l10n/sk_SK.php @@ -2,10 +2,11 @@ $TRANSLATIONS = array( "Local" => "Lokálny", "Location" => "Umiestnenie", -"URL" => "URL", +"Host" => "Hostiteľ", "Username" => "Používateľské meno", "Password" => "Heslo", "Share" => "Zdieľať", +"URL" => "URL", "Access granted" => "Prístup povolený", "Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox", "Grant access" => "Povoliť prístup", diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php index 04fa28127a5..c47e962b6e8 100644 --- a/apps/files_external/l10n/sl.php +++ b/apps/files_external/l10n/sl.php @@ -2,10 +2,33 @@ $TRANSLATIONS = array( "Local" => "Krajevno", "Location" => "Mesto", -"URL" => "Naslov URL", +"Amazon S3" => "Amazon S3", +"Key" => "Ključ", +"Secret" => "Skrivni ključ", +"Amazon S3 and compliant" => "Amazon S3 in podobno", +"Access Key" => "Ključ za dostop", +"Secret Key" => "Skrivni ključ", +"Hostname (optional)" => "Ime gostitelja (izbirno)", +"Port (optional)" => "Vrata (izbirno)", +"Region (optional)" => "Območje (izbirno)", +"Enable SSL" => "Omogoči SSL", +"Enable Path Style" => "Omogoči slog poti", +"App key" => "Programski ključ", +"App secret" => "Skrivni programski ključ", +"Host" => "Gostitelj", "Username" => "Uporabniško ime", "Password" => "Geslo", +"Root" => "Koren", +"Secure ftps://" => "Varni način ftps://", +"Client ID" => "ID odjemalca", +"Client secret" => "Skrivni ključ odjemalca", +"Username (required)" => "Uporabniško ime (zahtevano)", "Share" => "Souporaba", +"SMB / CIFS using OC login" => "SMB / CIFS z uporabo prijave OC", +"Username as share" => "Uporabniško ime za souporabo", +"URL" => "Naslov URL", +"Secure https://" => "Varni način https://", +"Remote subfolder" => "Oddaljena podrejena mapa", "Access granted" => "Dostop je odobren", "Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox", "Grant access" => "Odobri dostop", diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php index 563a1b7dd92..1904514fdc4 100644 --- a/apps/files_external/l10n/sq.php +++ b/apps/files_external/l10n/sq.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Vendndodhja", -"URL" => "URL-i", +"Host" => "Pritësi", "Username" => "Përdoruesi", "Password" => "fjalëkalim", "Share" => "Ndaj", +"URL" => "URL-i", "Groups" => "Grupet", "Users" => "Përdoruesit", "Delete" => "Elimino" diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php index b0276764a8d..bf150f5b5b0 100644 --- a/apps/files_external/l10n/sr.php +++ b/apps/files_external/l10n/sr.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "Location" => "Локација", +"Host" => "Домаћин", "Username" => "Корисничко име", "Password" => "Лозинка", "Share" => "Дели", diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php index a15ea0ed164..a1c2a7cabea 100644 --- a/apps/files_external/l10n/sv.php +++ b/apps/files_external/l10n/sv.php @@ -2,10 +2,18 @@ $TRANSLATIONS = array( "Local" => "Lokal", "Location" => "Plats", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Key" => "Nyckel", +"Secret" => "Hemlig", +"Enable SSL" => "Aktivera SSL", +"Host" => "Server", "Username" => "Användarnamn", "Password" => "Lösenord", +"Root" => "Root", +"Secure ftps://" => "Säker ftps://", "Share" => "Dela", +"URL" => "URL", +"Secure https://" => "Säker https://", "Access granted" => "Åtkomst beviljad", "Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox", "Grant access" => "Bevilja åtkomst", diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php index 066cf411dd6..a94b7417ff5 100644 --- a/apps/files_external/l10n/ta_LK.php +++ b/apps/files_external/l10n/ta_LK.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "இடம்", -"URL" => "URL", +"Host" => "ஓம்புனர்", "Username" => "பயனாளர் பெயர்", "Password" => "கடவுச்சொல்", "Share" => "பகிர்வு", +"URL" => "URL", "Access granted" => "அனுமதி வழங்கப்பட்டது", "Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு", "Grant access" => "அனுமதியை வழங்கல்", diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php index 3edf8c63824..9f393a2546f 100644 --- a/apps/files_external/l10n/th_TH.php +++ b/apps/files_external/l10n/th_TH.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "ตำแหน่งที่อยู่", -"URL" => "URL", +"Host" => "โฮสต์", "Username" => "ชื่อผู้ใช้งาน", "Password" => "รหัสผ่าน", "Share" => "แชร์", +"URL" => "URL", "Access granted" => "การเข้าถึงได้รับอนุญาตแล้ว", "Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox", "Grant access" => "อนุญาตให้เข้าถึงได้", diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php index aa3290bd4bc..5af8813e675 100644 --- a/apps/files_external/l10n/tr.php +++ b/apps/files_external/l10n/tr.php @@ -16,7 +16,7 @@ $TRANSLATIONS = array( "Enable Path Style" => "Yol Biçemini Etkinleştir", "App key" => "Uyg. anahtarı", "App secret" => "Uyg. parolası", -"URL" => "URL", +"Host" => "Sunucu", "Username" => "Kullanıcı Adı:", "Password" => "Parola:", "Root" => "Kök", @@ -36,6 +36,7 @@ $TRANSLATIONS = array( "Share" => "Paylaş", "SMB / CIFS using OC login" => "OC oturumu kullanarak SMB / CIFS", "Username as share" => "Paylaşım olarak kullanıcı adı", +"URL" => "URL", "Secure https://" => "Güvenli https://", "Remote subfolder" => "Uzak alt klasör", "Access granted" => "Giriş kabul edildi", diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php index bd7dc429865..701a5457ae2 100644 --- a/apps/files_external/l10n/ug.php +++ b/apps/files_external/l10n/ug.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "ئورنى", -"URL" => "URL", +"Host" => "باش ئاپپارات", "Username" => "ئىشلەتكۈچى ئاتى", "Password" => "ئىم", "Share" => "ھەمبەھىر", +"URL" => "URL", "Folder name" => "قىسقۇچ ئاتى", "External storage" => "سىرتقى ساقلىغۇچ", "Configuration" => "سەپلىمە", diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php index f644fe86063..aea352a6863 100644 --- a/apps/files_external/l10n/uk.php +++ b/apps/files_external/l10n/uk.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Місце", -"URL" => "URL", +"Host" => "Хост", "Username" => "Ім'я користувача", "Password" => "Пароль", "Share" => "Поділитися", +"URL" => "URL", "Access granted" => "Доступ дозволено", "Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox", "Grant access" => "Дозволити доступ", diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php index e2138b9046b..5d4695b5115 100644 --- a/apps/files_external/l10n/ur_PK.php +++ b/apps/files_external/l10n/ur_PK.php @@ -1,7 +1,11 @@ <?php $TRANSLATIONS = array( +"Location" => "مقام", "Username" => "یوزر نیم", "Password" => "پاسورڈ", -"Users" => "یوزرز" +"Share" => "تقسیم", +"URL" => "یو ار ایل", +"Users" => "یوزرز", +"Delete" => "حذف کریں" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php index 86d1236f665..03d50bc1433 100644 --- a/apps/files_external/l10n/vi.php +++ b/apps/files_external/l10n/vi.php @@ -1,10 +1,11 @@ <?php $TRANSLATIONS = array( "Location" => "Vị trí", -"URL" => "URL", +"Host" => "Máy chủ", "Username" => "Tên đăng nhập", "Password" => "Mật khẩu", "Share" => "Chia sẻ", +"URL" => "URL", "Access granted" => "Đã cấp quyền truy cập", "Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ", "Grant access" => "Cấp quyền truy cập", diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php index a61331de365..95e9c0e643e 100644 --- a/apps/files_external/l10n/zh_CN.php +++ b/apps/files_external/l10n/zh_CN.php @@ -1,26 +1,45 @@ <?php $TRANSLATIONS = array( +"Local" => "本地", "Location" => "地点", -"URL" => "URL", +"Amazon S3" => "Amazon S3", +"Access Key" => "访问密钥", +"Hostname (optional)" => "域名 (可选)", +"Port (optional)" => "端口 (可选)", +"Region (optional)" => "区域 (optional)", +"Enable SSL" => "启用 SSL", +"Host" => "主机", "Username" => "用户名", "Password" => "密码", +"Root" => "根路径", +"Secure ftps://" => "安全 ftps://", "Share" => "共享", +"SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信息", +"URL" => "URL", +"Secure https://" => "安全 https://", +"Remote subfolder" => "远程子文件夹", "Access granted" => "权限已授予。", "Error configuring Dropbox storage" => "配置Dropbox存储时出错", "Grant access" => "授权", "Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret", "Error configuring Google Drive storage" => "配置Google Drive存储时出错", +"Saved" => "已保存", +"<b>Note:</b> " => "<b>注意：</b>", +" and " => "和", "External Storage" => "外部存储", "Folder name" => "目录名称", "External storage" => "外部存储", "Configuration" => "配置", "Options" => "选项", +"Available for" => "可用于", "Add storage" => "添加存储", +"No user or group" => "无用户或组", "All Users" => "所有用户", "Groups" => "组", "Users" => "用户", "Delete" => "删除", "Enable User External Storage" => "启用用户外部存储", +"Allow users to mount the following external storage" => "允许用户挂载以下外部存储", "SSL root certificates" => "SSL根证书", "Import Root Certificate" => "导入根证书" ); diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php index b3a22c91bb2..5a154469487 100644 --- a/apps/files_external/l10n/zh_HK.php +++ b/apps/files_external/l10n/zh_HK.php @@ -1,9 +1,9 @@ <?php $TRANSLATIONS = array( -"URL" => "網址", "Username" => "用戶名稱", "Password" => "密碼", "Share" => "分享", +"URL" => "網址", "Folder name" => "資料夾名稱", "Groups" => "群組", "Users" => "用戶", diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php index a4b0ebe4dd5..154009f7a18 100644 --- a/apps/files_external/l10n/zh_TW.php +++ b/apps/files_external/l10n/zh_TW.php @@ -2,10 +2,11 @@ $TRANSLATIONS = array( "Local" => "本地", "Location" => "地點", -"URL" => "URL", +"Host" => "主機", "Username" => "使用者名稱：", "Password" => "密碼", "Share" => "分享", +"URL" => "URL", "Access granted" => "允許存取", "Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤", "Grant access" => "允許存取", diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 2093fb7e58c..7ff17f0e98a 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -25,7 +25,7 @@ namespace OC\Files\Storage; set_include_path(get_include_path() . PATH_SEPARATOR . - \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php'); + \OC_App::getAppPath('files_external') . '/3rdparty/aws-sdk-php'); require 'aws-autoloader.php'; use Aws\S3\S3Client; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 99eca2f38cf..7a651239cb4 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -132,7 +132,7 @@ class OC_Mount_Config { } // Load system mount points - $mountConfig = self::readData(false); + $mountConfig = self::readData(); if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) { foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) { $options['options'] = self::decryptPasswords($options['options']); @@ -169,7 +169,7 @@ class OC_Mount_Config { } // Load personal mount points - $mountConfig = self::readData(true); + $mountConfig = self::readData($user); if (isset($mountConfig[self::MOUNT_TYPE_USER][$user])) { foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) { $options['options'] = self::decryptPasswords($options['options']); @@ -233,7 +233,7 @@ class OC_Mount_Config { * @return array */ public static function getSystemMountPoints() { - $mountPoints = self::readData(false); + $mountPoints = self::readData(); $backends = self::getBackends(); $system = array(); if (isset($mountPoints[self::MOUNT_TYPE_GROUP])) { @@ -306,7 +306,7 @@ class OC_Mount_Config { * @return array */ public static function getPersonalMountPoints() { - $mountPoints = self::readData(true); + $mountPoints = self::readData(OCP\User::getUser()); $backEnds = self::getBackends(); $uid = OCP\User::getUser(); $personal = array(); @@ -359,10 +359,10 @@ class OC_Mount_Config { * Add a mount point to the filesystem * @param string $mountPoint Mount point * @param string $class Backend class - * @param array Backend parameters for the class + * @param array $classOptions Backend parameters for the class * @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER * @param string $applicable User or group to apply mount to - * @param bool Personal or system mount point i.e. is this being called from the personal or admin page + * @param bool $isPersonal Personal or system mount point i.e. is this being called from the personal or admin page * @return boolean */ public static function addMountPoint($mountPoint, @@ -400,28 +400,20 @@ class OC_Mount_Config { 'options' => self::encryptPasswords($classOptions)) ) ); - $mountPoints = self::readData($isPersonal); - // Merge the new mount point into the current mount points - if (isset($mountPoints[$mountType])) { - if (isset($mountPoints[$mountType][$applicable])) { - $mountPoints[$mountType][$applicable] - = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]); - } else { - $mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount); - } - } else { - $mountPoints[$mountType] = $mount; - } - self::writeData($isPersonal, $mountPoints); + + $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL); + $mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType); + self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints); + return self::getBackendStatus($class, $classOptions, $isPersonal); } /** * - * @param string Mount point - * @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER - * @param string User or group to remove mount from - * @param bool Personal or system mount point + * @param string $mountPoint Mount point + * @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER + * @param string $applicable User or group to remove mount from + * @param bool $isPersonal Personal or system mount point * @return bool */ public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) { @@ -434,7 +426,7 @@ class OC_Mount_Config { } else { $mountPoint = '/$user/files/'.ltrim($mountPoint, '/'); } - $mountPoints = self::readData($isPersonal); + $mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL); // Remove mount point unset($mountPoints[$mountType][$applicable][$mountPoint]); // Unset parent arrays if empty @@ -444,20 +436,20 @@ class OC_Mount_Config { unset($mountPoints[$mountType]); } } - self::writeData($isPersonal, $mountPoints); + self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints); return true; } /** * Read the mount points in the config file into an array - * @param boolean $isPersonal Personal or system config file + * @param string|null $user If not null, personal for $user, otherwise system * @return array */ - private static function readData($isPersonal) { + private static function readData($user = NULL) { $parser = new \OC\ArrayParser(); - if ($isPersonal) { - $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; - $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; + if (isset($user)) { + $phpFile = OC_User::getHome($user).'/mount.php'; + $jsonFile = OC_User::getHome($user).'/mount.json'; } else { $phpFile = OC::$SERVERROOT.'/config/mount.php'; $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/'); @@ -479,13 +471,12 @@ class OC_Mount_Config { /** * Write the mount points to the config file - * @param bool Personal or system config file - * @param array Mount points - * @param boolean $isPersonal + * @param string|null $user If not null, personal for $user, otherwise system + * @param array $data Mount points */ - private static function writeData($isPersonal, $data) { - if ($isPersonal) { - $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; + private static function writeData($user, $data) { + if (isset($user)) { + $file = OC_User::getHome($user).'/mount.json'; } else { $datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/'); $file = \OC_Config::getValue('mount_file', $datadir . '/mount.json'); @@ -619,9 +610,9 @@ class OC_Mount_Config { /** * Returns a dependency missing message - * @param $l OC_L10N - * @param $module string - * @param $backend string + * @param OC_L10N $l + * @param string $module + * @param string $backend * @return string */ private static function getSingleDependencyMessage($l, $module, $backend) { @@ -667,7 +658,7 @@ class OC_Mount_Config { /** * Encrypt a single password * @param string $password plain text password - * @return encrypted password + * @return string encrypted password */ private static function encryptPassword($password) { $cipher = self::getCipher(); @@ -679,7 +670,7 @@ class OC_Mount_Config { /** * Decrypts a single password * @param string $encryptedPassword encrypted password - * @return plain text password + * @return string plain text password */ private static function decryptPassword($encryptedPassword) { $cipher = self::getCipher(); @@ -691,6 +682,28 @@ class OC_Mount_Config { } /** + * Merges mount points + * @param array $data Existing mount points + * @param array $mountPoint New mount point + * @param string $mountType + * @return array + */ + private static function mergeMountPoints($data, $mountPoint, $mountType) { + $applicable = key($mountPoint); + if (isset($data[$mountType])) { + if (isset($data[$mountType][$applicable])) { + $data[$mountType][$applicable] + = array_merge($data[$mountType][$applicable], $mountPoint[$applicable]); + } else { + $data[$mountType] = array_merge($data[$mountType], $mountPoint); + } + } else { + $data[$mountType] = $mountPoint; + } + return $data; + } + + /** * Returns the encryption cipher */ private static function getCipher() { diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index 38de3360f2b..0b624b27176 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -63,10 +63,10 @@ class Dropbox extends \OC\Files\Storage\Common { } /** - * @brief Returns the path's metadata + * Returns the path's metadata * @param string $path path for which to return the metadata - * @param $list if true, also return the directory's contents - * @return directory contents if $list is true, file metadata if $list is + * @param bool $list if true, also return the directory's contents + * @return mixed directory contents if $list is true, file metadata if $list is * false, null if the file doesn't exist or "false" if the operation failed */ private function getMetaData($path, $list = false) { diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index b3f8b1444ae..2650a94f85e 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -64,7 +64,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{ /** * Unlinks file or directory - * @param string @path + * @param string $path */ public function unlink($path) { if ($this->is_dir($path)) { diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index b1d355323d9..6e53c4a9931 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -83,7 +83,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ /** * Unlinks file or directory - * @param string @path + * @param string $path */ public function unlink($path) { if ($this->is_dir($path)) { diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index a202d3843cb..03364867b0c 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -23,7 +23,7 @@ namespace OC\Files\Storage; set_include_path(get_include_path() . PATH_SEPARATOR . - \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib'); + \OC_App::getAppPath('files_external') . '/3rdparty/php-opencloud/lib'); require_once 'openstack.php'; use \OpenCloud; @@ -31,25 +31,25 @@ use \OpenCloud\Common\Exceptions; class Swift extends \OC\Files\Storage\Common { - /** - * @var \OpenCloud\ObjectStore - */ + /** + * @var \OpenCloud\ObjectStore + */ private $connection; - /** - * @var \OpenCloud\ObjectStore\Container - */ + /** + * @var \OpenCloud\ObjectStore\Container + */ private $container; - /** - * @var \OpenCloud\OpenStack - */ + /** + * @var \OpenCloud\OpenStack + */ private $anchor; - /** - * @var string - */ + /** + * @var string + */ private $bucket; - /** - * @var array - */ + /** + * @var array + */ private static $tmpFiles = array(); /** diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index 767c0adf58e..62aff4d1bc1 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -28,7 +28,7 @@ return array( 'wait'=> 0 ), 'owncloud'=>array( - 'run'=>true, + 'run'=>false, 'host'=>'localhost/owncloud', 'user'=>'test', 'password'=>'test', diff --git a/apps/files_external/tests/dynamicmountconfig.php b/apps/files_external/tests/dynamicmountconfig.php index 81a31e14c60..650299075e6 100644 --- a/apps/files_external/tests/dynamicmountconfig.php +++ b/apps/files_external/tests/dynamicmountconfig.php @@ -22,8 +22,6 @@ require_once __DIR__ . '/../../../lib/base.php'; -require __DIR__ . '/../lib/config.php'; - /** * Class Test_Mount_Config_Dummy_Backend */ diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php index 1921ec76af3..14fe1d90b7a 100644 --- a/apps/files_external/tests/mountconfig.php +++ b/apps/files_external/tests/mountconfig.php @@ -22,8 +22,6 @@ require_once __DIR__ . '/../../../lib/base.php'; -require __DIR__ . '/../lib/config.php'; - class Test_Mount_Config_Dummy_Storage { public function test() { return true; |