merge master into filesystem

6 files changed, 41 insertions, 5 deletions

diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index 6871b0fd1d4..664b3937e97 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -11,4 +11,3 @@ if ( $view->file_exists($file) ) {
 	$view->unlink($file);
 	OC_Mount_Config::createCertificateBundle();
 }
-
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
new file mode 100644
index 00000000000..5d57e5e4598
--- /dev/null
+++ b/apps/files_external/l10n/de_DE.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Access granted" => "Zugriff gestattet",
+"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
+"Grant access" => "Zugriff gestatten",
+"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
+"Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
+"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"External Storage" => "Externer Speicher",
+"Mount point" => "Mount-Point",
+"Backend" => "Backend",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add mount point" => "Mount-Point hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren"
+);
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index c518fca149e..a1dae9d4888 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,4 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Προσβαση παρασχέθηκε",
+"Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
+"Grant access" => "Παροχή πρόσβασης",
+"Fill out all required fields" => "Συμπληρώστε όλα τα απαιτούμενα πεδία",
+"Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
 "External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
 "Mount point" => "Σημείο προσάρτησης",
 "Backend" => "Σύστημα υποστήριξης",
@@ -7,7 +13,7 @@
 "Applicable" => "Εφαρμόσιμο",
 "Add mount point" => "Προσθήκη σημείου προσάρτησης",
 "None set" => "Κανένα επιλεγμένο",
-"All Users" => "Όλοι οι χρήστες",
+"All Users" => "Όλοι οι Χρήστες",
 "Groups" => "Ομάδες",
 "Users" => "Χρήστες",
 "Delete" => "Διαγραφή",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index 90819e3352c..97453aafedb 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,4 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Alirpermeso donita",
+"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
+"Grant access" => "Doni alirpermeson",
+"Fill out all required fields" => "Plenigu ĉiujn neprajn kampojn",
+"Please provide a valid Dropbox app key and secret." => "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
+"Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
 "External Storage" => "Malena memorilo",
 "Mount point" => "Surmetingo",
 "Backend" => "Motoro",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 04257a80144..04d5e3c7ee4 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "Prístup povolený",
+"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
 "Grant access" => "Povoliť prístup",
 "Fill out all required fields" => "Vyplňte všetky vyžadované kolónky",
 "Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 3ba86cf148b..c68369c72b2 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -120,10 +120,10 @@ class OC_Mount_Config {
 			$dir = $dir.'/'.$pathPart;
 			if ( !$view->file_exists($dir)) {
 				$view->mkdir($dir);
-			}		
+			}
 		}
 	}
-	
+
 
 	/**
 	* Add a mount point to the filesystem
@@ -160,7 +160,7 @@ class OC_Mount_Config {
 						self::addMountPointDirectory($view, $path);
 					}
 					break;
-				case 'group' : 
+				case 'group' :
 					$groupMembers = OC_Group::usersInGroups(array($applicable));
 					foreach ( $groupMembers as $user ) {
 						$path =  $user.'/files/'.ltrim($mountPoint, '/');