Merge in master

apps/files/ajax/download.php

@@ -33,4 +33,10 @@ OCP\User::checkLoggedIn();
 $files = $_GET["files"];
 $dir = $_GET["dir"];
 
-OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
+$files_list = json_decode($files);
+// in case we get only a single file
+if ($files_list === NULL ) {
+	$files_list = array($files);
+}
+
+OC_Files::get($dir, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);

apps/files/css/files.css

@@ -73,7 +73,7 @@ table th#headerSize, table td.filesize { min-width:3em; padding:0 1em; text-alig
 table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-align:left; }
 
 /* Multiselect bar */
-table.multiselect { top:63px; }
+#filestable.multiselect { top:63px; }
 table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
 table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
 table.multiselect #headerName { width: 100%; }

apps/files/js/files.js

@@ -220,14 +220,15 @@ $(document).ready(function() {
 	});
 
 	$('.download').click('click',function(event) {
-		var files=getSelectedFiles('name').join(';');
+		var files=getSelectedFiles('name');
+		var fileslist = JSON.stringify(files);
 		var dir=$('#dir').val()||'/';
 		OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
 		// use special download URL if provided, e.g. for public shared files
 		if ( (downloadURL = document.getElementById("downloadURL")) ) {
 			window.location=downloadURL.value+"&download&files="+files;
 		} else {
-			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: files });
+			window.location=OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist });
 		}
 		return false;
 	});

apps/files/l10n/cs_CZ.php

@@ -61,6 +61,7 @@
 "From link" => "Z odkazu",
 "Deleted files" => "Odstraněné soubory",
 "Cancel upload" => "Zrušit odesílání",
+"You don’t have write permissions here." => "Nemáte zde práva zápisu.",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
 "Download" => "Stáhnout",
 "Unshare" => "Zrušit sdílení",

apps/files/l10n/da.php

@@ -59,7 +59,9 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
+"Deleted files" => "Slettede filer",
 "Cancel upload" => "Fortryd upload",
+"You don’t have write permissions here." => "Du har ikke skriverettigheder her.",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Download" => "Download",
 "Unshare" => "Fjern deling",

apps/files/l10n/de.php

@@ -61,6 +61,7 @@
 "From link" => "Von einem Link",
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
+"You don’t have write permissions here." => "Du besitzt hier keine Schreib-Berechtigung.",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
 "Unshare" => "Nicht mehr freigeben",

apps/files/l10n/de_DE.php

@@ -61,6 +61,7 @@
 "From link" => "Von einem Link",
 "Deleted files" => "Gelöschte Dateien",
 "Cancel upload" => "Upload abbrechen",
+"You don’t have write permissions here." => "Sie haben hier keine Schreib-Berechtigungen.",
 "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
 "Download" => "Herunterladen",
 "Unshare" => "Nicht mehr freigeben",

apps/files/l10n/es.php

@@ -61,6 +61,7 @@
 "From link" => "Desde el enlace",
 "Deleted files" => "Archivos eliminados",
 "Cancel upload" => "Cancelar subida",
+"You don’t have write permissions here." => "No tienes permisos para escribir aquí.",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
 "Download" => "Descargar",
 "Unshare" => "Dejar de compartir",

apps/files/l10n/lv.php

@@ -61,6 +61,7 @@
 "From link" => "No saites",
 "Deleted files" => "Dzēstās datnes",
 "Cancel upload" => "Atcelt augšupielādi",
+"You don’t have write permissions here." => "Jums nav tiesību šeit rakstīt.",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
 "Download" => "Lejupielādēt",
 "Unshare" => "Pārtraukt dalīšanos",

apps/files/l10n/nb_NO.php

@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
+"Delete permanently" => "Slett permanent",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
 "Pending" => "Ventende",

apps/files/l10n/nl.php

@@ -61,6 +61,7 @@
 "From link" => "Vanaf link",
 "Deleted files" => "Verwijderde bestanden",
 "Cancel upload" => "Upload afbreken",
+"You don’t have write permissions here." => "U hebt hier geen schrijfpermissies.",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
 "Download" => "Download",
 "Unshare" => "Stop delen",

apps/files/l10n/pt_BR.php

@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Não possível mover %s - Um arquivo com este nome já existe",
+"Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
-"Could not move %s" => "Não possível mover %s",
+"Could not move %s" => "Impossível mover %s",
 "Unable to rename file" => "Impossível renomear arquivo",
-"No file was uploaded. Unknown error" => "Nenhum arquivo foi transferido. Erro desconhecido",
+"No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
 "There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
@@ -27,10 +27,10 @@
 "'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
 "File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
-"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não serão mais atualizados nem sincronizados!",
+"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo por ele ser um diretório ou ter 0 bytes.",
 "Upload Error" => "Erro de envio",
 "Close" => "Fechar",
 "1 file uploading" => "enviando 1 arquivo",
@@ -50,7 +50,7 @@
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho máximo para carregar",
 "max. possible: " => "max. possível:",
-"Needed for multi-file and folder downloads." => "Necessário para multiplos arquivos e diretório de downloads.",
+"Needed for multi-file and folder downloads." => "Necessário para download de múltiplos arquivos e diretórios.",
 "Enable ZIP-download" => "Habilitar ZIP-download",
 "0 is unlimited" => "0 para ilimitado",
 "Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
@@ -61,6 +61,7 @@
 "From link" => "Do link",
 "Deleted files" => "Arquivos apagados",
 "Cancel upload" => "Cancelar upload",
+"You don’t have write permissions here." => "Você não possui permissão de escrita aqui.",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
 "Download" => "Baixar",
 "Unshare" => "Descompartilhar",
@@ -68,5 +69,5 @@
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
 "Current scanning" => "Scanning atual",
-"Upgrading filesystem cache..." => "Aprimorando cache do sistema de arquivos..."
+"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
 );

apps/files/l10n/pt_PT.php

@@ -61,6 +61,7 @@
 "From link" => "Da ligação",
 "Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar envio",
+"You don’t have write permissions here." => "Não tem permissões de escrita aqui.",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
 "Unshare" => "Deixar de partilhar",

apps/files/l10n/sv.php

@@ -61,6 +61,7 @@
 "From link" => "Från länk",
 "Deleted files" => "Raderade filer",
 "Cancel upload" => "Avbryt uppladdning",
+"You don’t have write permissions here." => "Du saknar skrivbehörighet här.",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
 "Download" => "Ladda ner",
 "Unshare" => "Sluta dela",

apps/files/l10n/uk.php

@@ -61,6 +61,7 @@
 "From link" => "З посилання",
 "Deleted files" => "Видалено файлів",
 "Cancel upload" => "Перервати завантаження",
+"You don’t have write permissions here." => "У вас тут немає прав на запис.",
 "Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
 "Download" => "Завантажити",
 "Unshare" => "Заборонити доступ",

apps/files/templates/admin.php

@@ -16,7 +16,7 @@
 			   <?php if ($_['allowZipDownload']): ?> checked="checked"<?php endif; ?> />
 		<label for="allowZipDownload"><?php p($l->t( 'Enable ZIP-download' )); ?></label><br/>
 
-		<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
+		<input type="text" name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php p($_['maxZipInputSize']) ?>'
 			   title="<?php p($l->t( '0 is unlimited' )); ?>"
 			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
 		<em><?php p($l->t( 'Maximum input size for ZIP files' )); ?> </em><br />

apps/files_encryption/appinfo/app.php

@@ -1,13 +1,13 @@
 <?php
 
-OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'apps/files_encryption/lib/crypt.php';
+OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'files_encryption/lib/crypt.php';
-OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'apps/files_encryption/hooks/hooks.php';
+OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'files_encryption/hooks/hooks.php';
-OC::$CLASSPATH['OCA\Encryption\Util'] = 'apps/files_encryption/lib/util.php';
+OC::$CLASSPATH['OCA\Encryption\Util'] = 'files_encryption/lib/util.php';
-OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'apps/files_encryption/lib/keymanager.php';
+OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.php';
-OC::$CLASSPATH['OCA\Encryption\Stream'] = 'apps/files_encryption/lib/stream.php';
+OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
-OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'apps/files_encryption/lib/proxy.php';
+OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
-OC::$CLASSPATH['OCA\Encryption\Session'] = 'apps/files_encryption/lib/session.php';
+OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
-OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'apps/files_encryption/lib/capabilities.php';
+OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
 
 OC_FileProxy::register( new OCA\Encryption\Proxy() );
 

apps/files_encryption/l10n/nb_NO.php

@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Kryptering",
+"File encryption is enabled." => "Fil-kryptering er aktivert.",
+"The following file types will not be encrypted:" => "Følgende filtyper vil ikke bli kryptert:",
+"Exclude the following file types from encryption:" => "Ekskluder følgende filtyper fra kryptering:",
 "None" => "Ingen"
 );

apps/files_external/appinfo/app.php

@@ -6,16 +6,16 @@
  * See the COPYING-README file.
  */
 
-OC::$CLASSPATH['OC\Files\Storage\StreamWrapper']='apps/files_external/lib/streamwrapper.php';
+OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
-OC::$CLASSPATH['OC\Files\Storage\FTP']='apps/files_external/lib/ftp.php';
+OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';
-OC::$CLASSPATH['OC\Files\Storage\DAV']='apps/files_external/lib/webdav.php';
+OC::$CLASSPATH['OC\Files\Storage\DAV'] = 'files_external/lib/webdav.php';
-OC::$CLASSPATH['OC\Files\Storage\Google']='apps/files_external/lib/google.php';
+OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
-OC::$CLASSPATH['OC\Files\Storage\SWIFT']='apps/files_external/lib/swift.php';
+OC::$CLASSPATH['OC\Files\Storage\SWIFT'] = 'files_external/lib/swift.php';
-OC::$CLASSPATH['OC\Files\Storage\SMB']='apps/files_external/lib/smb.php';
+OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
-OC::$CLASSPATH['OC\Files\Storage\AmazonS3']='apps/files_external/lib/amazons3.php';
+OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
-OC::$CLASSPATH['OC\Files\Storage\Dropbox']='apps/files_external/lib/dropbox.php';
+OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
-OC::$CLASSPATH['OC\Files\Storage\SFTP']='apps/files_external/lib/sftp.php';
+OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
-OC::$CLASSPATH['OC_Mount_Config']='apps/files_external/lib/config.php';
+OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 
 OCP\App::registerAdmin('files_external', 'settings');
 if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') {

apps/files_external/l10n/nb_NO.php

@@ -1,9 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Tilgang innvilget",
+"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
+"Grant access" => "Gi tilgang",
+"External Storage" => "Ekstern lagring",
 "Folder name" => "Mappenavn",
+"External storage" => "Ekstern lagringsplass",
 "Configuration" => "Konfigurasjon",
 "Options" => "Innstillinger",
+"Applicable" => "Anvendelig",
+"Add storage" => "Legg til lagringsplass",
+"None set" => "Ingen valgt",
 "All Users" => "Alle brukere",
 "Groups" => "Grupper",
 "Users" => "Brukere",
-"Delete" => "Slett"
+"Delete" => "Slett",
+"Enable User External Storage" => "Aktiver ekstern lagring for bruker",
+"Allow users to mount their own external storage" => "Tillat brukere å koble til egne eksterne lagringsmedium",
+"SSL root certificates" => "SSL root-sertifikater",
+"Import Root Certificate" => "Importer root-sertifikat"
 );

apps/files_external/l10n/nl.php

@@ -8,9 +8,11 @@
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
 "External Storage" => "Externe opslag",
 "Folder name" => "Mapnaam",
+"External storage" => "Externe opslag",
 "Configuration" => "Configuratie",
 "Options" => "Opties",
 "Applicable" => "Van toepassing",
+"Add storage" => "Toevoegen opslag",
 "None set" => "Niets ingesteld",
 "All Users" => "Alle gebruikers",
 "Groups" => "Groepen",

apps/files_external/l10n/pt_BR.php

@@ -4,13 +4,15 @@
 "Grant access" => "Permitir acesso",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça um app key e secret válido do Dropbox",
 "Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> \"smbclient\" não está instalado. Não será possível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Não será possível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
+"External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
 "Applicable" => "Aplicável",
+"Add storage" => "Adicionar Armazenamento",
 "None set" => "Nenhum definido",
 "All Users" => "Todos os Usuários",
 "Groups" => "Grupos",

apps/files_external/l10n/pt_PT.php

@@ -4,18 +4,20 @@
 "Grant access" => "Conceder acesso",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
 "External Storage" => "Armazenamento Externo",
 "Folder name" => "Nome da pasta",
+"External storage" => "Armazenamento Externo",
 "Configuration" => "Configuração",
 "Options" => "Opções",
 "Applicable" => "Aplicável",
-"None set" => "Nenhum configurado",
+"Add storage" => "Adicionar armazenamento",
+"None set" => "Não definido",
 "All Users" => "Todos os utilizadores",
 "Groups" => "Grupos",
 "Users" => "Utilizadores",
-"Delete" => "Apagar",
+"Delete" => "Eliminar",
 "Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador",
 "Allow users to mount their own external storage" => "Permitir que os utilizadores montem o seu próprio armazenamento externo",
 "SSL root certificates" => "Certificados SSL de raiz",

apps/files_external/l10n/sv.php

@@ -8,9 +8,11 @@
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat.",
 "External Storage" => "Extern lagring",
 "Folder name" => "Mappnamn",
+"External storage" => "Extern lagring",
 "Configuration" => "Konfiguration",
 "Options" => "Alternativ",
 "Applicable" => "Tillämplig",
+"Add storage" => "Lägg till lagring",
 "None set" => "Ingen angiven",
 "All Users" => "Alla användare",
 "Groups" => "Grupper",

apps/files_external/l10n/uk.php

@@ -8,9 +8,11 @@
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.",
 "External Storage" => "Зовнішні сховища",
 "Folder name" => "Ім'я теки",
+"External storage" => "Зовнішнє сховище",
 "Configuration" => "Налаштування",
 "Options" => "Опції",
 "Applicable" => "Придатний",
+"Add storage" => "Додати сховище",
 "None set" => "Не встановлено",
 "All Users" => "Усі користувачі",
 "Groups" => "Групи",

apps/files_sharing/appinfo/app.php

@@ -1,11 +1,11 @@
 <?php
 
-OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
+OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
-OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
+OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
-OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php";
+OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php';
+OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php';
+OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php';
-OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php';
+OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
 OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');

apps/files_sharing/lib/permissions.php

@@ -76,7 +76,7 @@ class Shared_Permissions extends Permissions {
 	 * @param int $fileId
 	 * @param string $user
 	 */
-	public function remove($fileId, $user) {
+	public function remove($fileId, $user = null) {
 		// Not a valid action for Shared Permissions
 	}
 

apps/files_sharing/lib/share/file.php

@@ -73,7 +73,9 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 		if ($format == self::FORMAT_SHARED_STORAGE) {
 			// Only 1 item should come through for this format call
 			return array(
+				'parent' => $items[key($items)]['parent'],
 				'path' => $items[key($items)]['path'],
+				'storage' => $items[key($items)]['storage'],
 				'permissions' => $items[key($items)]['permissions'],
 				'uid_owner' => $items[key($items)]['uid_owner']
 			);
@@ -139,13 +141,28 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 			$source = \OCP\Share::getItemSharedWith('folder', $folder, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
 			if ($source) {
 				$source['path'] = $source['path'].substr($target, strlen($folder));
-				return $source;
 			}
 		} else {
 			$source = \OCP\Share::getItemSharedWith('file', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
-			if ($source) {
-				return $source;
 		}
+		if ($source) {
+			if (isset($source['parent'])) {
+				$parent = $source['parent'];
+				while (isset($parent)) {
+					$query = \OC_DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+					$item = $query->execute(array($parent))->fetchRow();
+					if (isset($item['parent'])) {
+						$parent = $item['parent'];
+					} else {
+						$fileOwner = $item['uid_owner'];
+						break;
+					}
+				}
+			} else {
+				$fileOwner = $source['uid_owner'];
+			}
+			$source['fileOwner'] = $fileOwner;
+			return $source;
 		}
 		\OCP\Util::writeLog('files_sharing', 'File source not found for: '.$target, \OCP\Util::ERROR);
 		return false;

apps/files_sharing/lib/sharedstorage.php

@@ -45,11 +45,7 @@ class Shared extends \OC\Files\Storage\Common {
 	*/
 	private function getFile($target) {
 		if (!isset($this->files[$target])) {
-			$source = \OC_Share_Backend_File::getSource($target);
+			$this->files[$target] = \OC_Share_Backend_File::getSource($target);
-			if ($source) {
-				$source['path'] = '/'.$source['uid_owner'].'/'.$source['path'];
-			}
-			$this->files[$target] = $source;
 		}
 		return $this->files[$target];
 	}
@@ -62,8 +58,16 @@ class Shared extends \OC\Files\Storage\Common {
 	private function getSourcePath($target) {
 		$source = $this->getFile($target);
 		if ($source) {
-			\OC\Files\Filesystem::initMountPoints($source['uid_owner']);
+			if (!isset($source['fullPath'])) {
-			return $source['path'];
+				\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
+				$mount = \OC\Files\Mount::findByNumericId($source['storage']);
+				if ($mount) {
+					$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
+				} else {
+					$this->files[$target]['fullPath'] = false;
+				}
+			}
+			return $this->files[$target]['fullPath'];
 		}
 		return false;
 	}
@@ -430,7 +434,7 @@ class Shared extends \OC\Files\Storage\Common {
 		}
 		$source = $this->getFile($path);
 		if ($source) {
-			return $source['uid_owner'];
+			return $source['fileOwner'];
 		}
 		return false;
 	}

apps/files_sharing/public.php

@@ -141,7 +141,9 @@ if (isset($path)) {
 			OCP\Util::addscript('files', 'keyboardshortcuts');
 			$files = array();
 			$rootLength = strlen($basePath) + 1;
+			$totalSize = 0;
 			foreach (\OC\Files\Filesystem::getDirectoryContent($path) as $i) {
+				$totalSize += $i['size'];
 				$i['date'] = OCP\Util::formatDate($i['mtime']);
 				if ($i['type'] == 'file') {
 					$fileinfo = pathinfo($i['name']);
@@ -188,7 +190,9 @@ if (isset($path)) {
 			$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
 			$folder->assign('usedSpacePercent', 0);
 			$tmpl->assign('folder', $folder->fetchPage());
-			$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true)
+						&& $totalSize <= OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
+			$tmpl->assign('allowZipDownload', intval($allowZip));
 			$tmpl->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
 		} else {

apps/files_sharing/templates/authenticate.php

@@ -2,7 +2,7 @@
 	<fieldset>
 		<p class="infield">
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
-			<input type="password" name="password" id="password" value="" autofocus />
+			<input type="password" name="password" id="password" placeholder="" value="" autofocus />
 			<input type="submit" value="<?php p($l->t('Submit')); ?>" />
 		</p>
 	</fieldset>

apps/files_trashbin/appinfo/app.php

@@ -1,7 +1,7 @@
 <?php
 
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
 
 
 OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook");

apps/files_trashbin/index.php

@@ -95,9 +95,10 @@ foreach (explode('/', $dir) as $i) {
 	}
 }
 
-$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
+$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb);
 $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php') . '?dir=');
+$breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
 
 $list = new OCP\Template('files_trashbin', 'part.list', '');
 $list->assign('files', $files);
@@ -105,6 +106,7 @@ $list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir=
 $list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir);
 $list->assign('disableSharing', true);
 $list->assign('dirlisting', $dirlisting);
+$tmpl->assign('dirlisting', $dirlisting);
 $list->assign('disableDownloadActions', true);
 $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
 $tmpl->assign('fileList', $list->fetchPage());

apps/files_trashbin/l10n/nb_NO.php

@@ -1,8 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
+"Couldn't restore %s" => "Kunne ikke gjenopprette %s",
+"perform restore operation" => "utfør gjenopprettings operasjon",
+"delete file permanently" => "slett filer permanent",
+"Delete permanently" => "Slett permanent",
 "Name" => "Navn",
+"Deleted" => "Slettet",
 "1 folder" => "1 mappe",
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
+"Restore" => "Gjenopprett",
 "Delete" => "Slett"
 );

apps/files_trashbin/templates/index.php

@@ -9,7 +9,7 @@
 	<div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 <?php endif; ?>
 
-<table>
+<table id="filestable">
 	<thead>
 		<tr>
 			<th id='headerName'>

apps/files_trashbin/templates/part.breadcrumb.php

@@ -0,0 +1,20 @@
+<div class="crumb">
+		<a href="<?php print_unescaped($_['home']); ?>">
+			<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
+		</a>
+</div>
+<?php if(count($_["breadcrumb"])):?>
+	<div class="crumb svg"
+		 data-dir='<?php print_unescaped($_['baseURL']); ?>'>
+	<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
+	</div>
+<?php endif;?>
+<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
+	$crumb = $_["breadcrumb"][$i];
+	$dir = str_replace('+', '%20', urlencode($crumb["dir"]));
+	$dir = str_replace('%2F', '/', $dir); ?>
+	<div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
+		 data-dir='<?php p($dir);?>'>
+	<a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
+	</div>
+<?php endfor;

apps/files_versions/appinfo/app.php

@@ -1,9 +1,9 @@
 <?php
 
 //require_once 'files_versions/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
+OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'apps/files_versions/lib/capabilities.php';
+OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
 
 OCP\Util::addscript('files_versions', 'versions');
 

apps/files_versions/l10n/da.php

@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Filen %s blev genskabt til version: %s",
 "No old versions available" => "Ingen gamle version tilgængelige",
 "No path specified" => "Ingen sti specificeret",
+"Versions" => "Versioner",
 "Revert a file to a previous version by clicking on its revert button" => "Genskab en fil til en tidligere version ved at klikke på denne genskab knap."
 );

apps/files_versions/l10n/nl.php

@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Bestand %s kon niet worden teruggedraaid naar versie %s",
 "No old versions available" => "Geen oudere versies beschikbaar",
 "No path specified" => "Geen pad opgegeven",
+"Versions" => "Versies",
 "Revert a file to a previous version by clicking on its revert button" => "Draai een bestand terug naar een voorgaande versie door te klikken op de terugdraai knop"
 );

apps/files_versions/l10n/pt_BR.php

@@ -1,10 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Could not revert: %s" => "Não foi possível reverter: %s",
+"Could not revert: %s" => "Impossível reverter: %s",
 "success" => "sucesso",
 "File %s was reverted to version %s" => "Arquivo %s revertido à versão %s",
 "failure" => "falha",
 "File %s could not be reverted to version %s" => "Arquivo %s não pôde ser revertido à versão %s",
 "No old versions available" => "Nenhuma versão antiga disponível",
 "No path specified" => "Nenhum caminho especificado",
+"Versions" => "Versões",
 "Revert a file to a previous version by clicking on its revert button" => "Reverta um arquivo a uma versão anterior clicando no botão reverter"
 );

apps/files_versions/l10n/pt_PT.php

@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Não foi possível reverter o ficheiro %s para a versão %s",
 "No old versions available" => "Não existem versões mais antigas",
 "No path specified" => "Nenhum caminho especificado",
+"Versions" => "Versões",
 "Revert a file to a previous version by clicking on its revert button" => "Reverter um ficheiro para uma versão anterior clicando no seu botão reverter."
 );

apps/files_versions/l10n/uk.php

@@ -6,5 +6,6 @@
 "File %s could not be reverted to version %s" => "Файл %s не може бути відновлений до версії %s",
 "No old versions available" => "Старі версії недоступні",
 "No path specified" => "Шлях не вказаний",
+"Versions" => "Версії",
 "Revert a file to a previous version by clicking on its revert button" => "Відновити файл на попередню версію, натиснувши на кнопку Відновити"
 );

apps/files_versions/lib/versions.php

@@ -82,6 +82,14 @@ class Storage {
 	 */
 	public static function store($filename) {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+			
+			// if the file gets streamed we need to remove the .part extension
+			// to get the right target
+			$ext = pathinfo($filename, PATHINFO_EXTENSION);
+			if ($ext === 'part') {
+				$filename = substr($filename, 0, strlen($filename)-5);
+			}
+			
 			list($uid, $filename) = self::getUidAndFilename($filename);
 
 			$files_view = new \OC\Files\View('/'.$uid .'/files');
@@ -442,12 +450,12 @@ class Storage {
 				}
 			}
 
-			// check if enough space is available after versions are rearranged.
+			// Check if enough space is available after versions are rearranged.
-			// if not we delete the oldest versions until we meet the size limit for versions
+			// If not we delete the oldest versions until we meet the size limit for versions,
-			$numOfVersions = count($all_versions);
+			// but always keep the two latest versions
+			$numOfVersions = count($all_versions) -2 ;
 			$i = 0;
-			while ($availableSpace < 0) {
+			while ($availableSpace < 0 && $i < $numOfVersions) {
-				if ($i = $numOfVersions-2) break; // keep at least the last version
 				$versions_fileview->unlink($all_versions[$i]['path'].'.v'.$all_versions[$i]['version']);
 				$versionsSize -= $all_versions[$i]['size'];
 				$availableSpace += $all_versions[$i]['size'];

apps/user_ldap/group_ldap.php

@@ -209,6 +209,19 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		return $groupUsers;
 	}
 
+	/**
+	 * @brief get a list of all display names in a group
+	 * @returns array with display names (value) and user ids(key)
+	 */
+	public function displayNamesInGroup($gid, $search, $limit, $offset) {
+		$users = $this->usersInGroup($gid, $search, $limit, $offset);
+		$displayNames = array();
+		foreach($users as $user) {
+			$displayNames[$user] = \OC_User::getDisplayName($user);
+		}
+		return $displayNames;
+	}
+
 	/**
 	 * @brief get a list of all groups
 	 * @returns array with group names
@@ -287,8 +300,6 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		//always returns false, because possible actions are modifying
+		return (bool)(OC_GROUP_BACKEND_GET_DISPLAYNAME	& $actions);
-		// actions. We do not write to LDAP, at least for now.
-		return false;
 	}
 }

apps/user_ldap/group_proxy.php

@@ -135,6 +135,22 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
 		return $users;
 	}
 
+	/**
+	 * @brief get a list of all display names in a group
+	 * @returns array with display names (value) and user ids(key)
+	 */
+	public function displayNamesInGroup($gid, $search, $limit, $offset) {
+		$displayNames = array();
+
+		foreach($this->backends as $backend) {
+			$backendUsers = $backend->displayNamesInGroup($gid, $search, $limit, $offset);
+			if (is_array($backendUsers)) {
+				$displayNames = array_merge($displayNames, $backendUsers);
+			}
+		}
+		return $displayNames;
+	}
+
 	/**
 	 * @brief get a list of all groups
 	 * @returns array with group names

apps/user_ldap/l10n/cs_CZ.php

@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Selhalo smazání konfigurace serveru",
+"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
 "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "Nastavení je neplatné. Zkontrolujte, prosím, záznam ownCloud pro další podrobnosti.",
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud",
 "Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.",
+"Cache Time-To-Live" => "TTL vyrovnávací paměti",
 "in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.",
 "Directory Settings" => "Nastavení adresáře",
 "User Display Name Field" => "Pole pro zobrazované jméno uživatele",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atributy vyhledávání skupin",
 "Group-Member association" => "Asociace člena skupiny",
 "Special Attributes" => "Speciální atributy",
+"Quota Field" => "Pole pro kvótu",
+"Quota Default" => "Výchozí kvóta",
 "in bytes" => "v bajtech",
+"Email Field" => "Pole e-mailu",
+"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
+"Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda"
 );

apps/user_ldap/l10n/de_DE.php

@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Schalten Sie die SSL-Zertifikatsprüfung aus.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
 "Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
+"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
 "in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
 "Directory Settings" => "Verzeichniseinstellungen",
 "User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Gruppen-Suche Eigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Special Attributes" => "Besondere Eigenschaften",
+"Quota Field" => "Kontingent Feld",
+"Quota Default" => "Kontingent Standard",
 "in bytes" => "in Bytes",
+"Email Field" => "E-Mail Feld",
+"User Home Folder Naming Rule" => "Benennungsregel für das Heimatverzeichnis des Benutzers",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe"
 );

apps/user_ldap/l10n/es.php

@@ -15,7 +15,7 @@
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Server configuration" => "Configuración del Servidor",
 "Add Server Configuration" => "Agregar configuracion del servidor",
-"Host" => "Máquina",
+"Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
 "Base DN" => "DN base",
 "One Base DN per line" => "Un DN Base por línea",
@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
 "Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
+"Cache Time-To-Live" => "Cache TTL",
 "in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
 "Directory Settings" => "Configuracion de directorio",
 "User Display Name Field" => "Campo de nombre de usuario a mostrar",
@@ -63,7 +64,11 @@
 "Group Search Attributes" => "Atributos de busqueda de grupo",
 "Group-Member association" => "Asociación Grupo-Miembro",
 "Special Attributes" => "Atributos especiales",
+"Quota Field" => "Cuota",
+"Quota Default" => "Cuota por defecto",
 "in bytes" => "en bytes",
+"Email Field" => "E-mail",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+"Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda"
 );

apps/user_ldap/l10n/it.php

@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud.",
 "Not recommended, use for testing only." => "Non consigliato, utilizzare solo per test.",
+"Cache Time-To-Live" => "Tempo di vita della cache",
 "in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
 "Directory Settings" => "Impostazioni delle cartelle",
 "User Display Name Field" => "Campo per la visualizzazione del nome utente",
@@ -67,6 +68,7 @@
 "Quota Default" => "Quota predefinita",
 "in bytes" => "in byte",
 "Email Field" => "Campo Email",
+"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto"

apps/user_ldap/l10n/nb_NO.php

@@ -1,11 +1,58 @@
 <?php $TRANSLATIONS = array(
-"Deletion failed" => "Sletting feilet",
+"Failed to delete the server configuration" => "Klarte ikke å slette tjener-konfigurasjonen.",
+"The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "Konfigurasjonen er ikke i orden. Vennligst se ownClouds logfil for flere detaljer.",
+"Deletion failed" => "Sletting mislyktes",
+"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
+"Keep settings?" => "Behold innstillinger?",
+"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"Connection test succeeded" => "Tilkoblingstest lyktes",
+"Connection test failed" => "Tilkoblingstest mislyktes",
+"Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
+"Confirm Deletion" => "Bekreft sletting",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spør din system-administrator om å deaktivere en av dem.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
+"Server configuration" => "Tjener-konfigurasjon",
+"Add Server Configuration" => "Legg til tjener-konfigurasjon",
+"Host" => "Tjener",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "En hoved DN pr. linje",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen",
+"User DN" => "Bruker DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt.",
 "Password" => "Passord",
+"For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
+"User Login Filter" => "Brukerpålogging filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "bruk %%uid plassholder, f.eks. \"uid=%%uid\"",
+"User List Filter" => "Brukerliste filter",
+"Defines the filter to apply, when retrieving users." => "Definerer filteret som skal brukes, når systemet innhenter brukere.",
+"without any placeholder, e.g. \"objectClass=person\"." => "uten noe plassholder, f.eks. \"objectClass=person\".",
 "Group Filter" => "Gruppefilter",
+"Defines the filter to apply, when retrieving groups." => "Definerer filteret som skal brukes, når systemet innhenter grupper.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "uten noe plassholder, f.eks. \"objectClass=posixGroup\".",
+"Configuration Active" => "Konfigurasjon aktiv",
+"When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
 "Port" => "Port",
+"Backup (Replica) Host" => "Sikkerhetskopierings (Replica) vert",
 "Use TLS" => "Bruk TLS",
+"Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
+"Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener.",
 "Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
 "in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
+"User Display Name Field" => "Vis brukerens navnfelt",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP-attributen å bruke for å generere brukers ownCloud navn.",
+"Base User Tree" => "Hovedbruker tre",
+"One User Base DN per line" => "En Bruker Base DN pr. linje",
+"Group Display Name Field" => "Vis gruppens navnfelt",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP-attributen å bruke for å generere gruppens ownCloud navn.",
+"Base Group Tree" => "Hovedgruppe tre",
+"One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
+"Group-Member association" => "gruppe-medlem assosiasjon",
 "in bytes" => "i bytes",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
 "Help" => "Hjelp"
 );

apps/user_ldap/l10n/nl.php

@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server.",
 "Not recommended, use for testing only." => "Niet aangeraden, gebruik alleen voor test doeleinden.",
+"Cache Time-To-Live" => "Cache time-to-live",
 "in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
 "Directory Settings" => "Mapinstellingen",
 "User Display Name Field" => "Gebruikers Schermnaam Veld",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Attributen voor groepszoekopdrachten",
 "Group-Member association" => "Groepslid associatie",
 "Special Attributes" => "Speciale attributen",
+"Quota Field" => "Quota veld",
+"Quota Default" => "Quota standaard",
 "in bytes" => "in bytes",
+"Email Field" => "E-mailveld",
+"User Home Folder Naming Rule" => "Gebruikers Home map naamgevingsregel",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+"Test Configuration" => "Test configuratie",
 "Help" => "Help"
 );

apps/user_ldap/l10n/pt_BR.php

@@ -2,20 +2,20 @@
 "Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o \"log\" do ownCloud para mais detalhes.",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "A configuração é inválida. Leia o log do ownCloud para mais detalhes.",
 "Deletion failed" => "Remoção falhou",
 "Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
 "Keep settings?" => "Manter ajustes?",
-"Cannot add server configuration" => "Não foi possível adicionar a configuração do servidor",
+"Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
-"Connection test succeeded" => "Teste de conexão bem sucedido",
+"Connection test succeeded" => "Teste de conexão bem sucedida",
 "Connection test failed" => "Teste de conexão falhou",
 "Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
 "Confirm Deletion" => "Confirmar Exclusão",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "Server configuration" => "Configuração de servidor",
-"Add Server Configuration" => "Adicionar configuração de servidor",
+"Add Server Configuration" => "Adicionar Configuração de Servidor",
-"Host" => "Host",
+"Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
 "Base DN" => "DN Base",
 "One Base DN per line" => "Uma base DN por linha",
@@ -28,39 +28,48 @@
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login.",
 "use %%uid placeholder, e.g. \"uid=%%uid\"" => "use %%uid placeholder, ex. \"uid=%%uid\"",
 "User List Filter" => "Filtro de Lista de Usuário",
-"Defines the filter to apply, when retrieving users." => "Define filtro a aplicar ao obter usuários.",
+"Defines the filter to apply, when retrieving users." => "Define filtro a ser aplicado ao obter usuários.",
 "without any placeholder, e.g. \"objectClass=person\"." => "sem nenhum espaço reservado, ex. \"objectClass=person\".",
 "Group Filter" => "Filtro de Grupo",
 "Defines the filter to apply, when retrieving groups." => "Define o filtro a aplicar ao obter grupos.",
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\"",
-"Connection Settings" => "Configurações de conexão",
+"Connection Settings" => "Configurações de Conexão",
 "Configuration Active" => "Configuração ativa",
-"When unchecked, this configuration will be skipped." => "Quando assinalada, esta configuração será pulada.",
+"When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
 "Port" => "Porta",
+"Backup (Replica) Host" => "Servidor de Backup (Réplica)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
+"Backup (Replica) Port" => "Porta do Backup (Réplica)",
 "Disable Main Server" => "Desativar Servidor Principal",
-"When switched on, ownCloud will only connect to the replica server." => "Quando ativado, ownCloud somente conectar-se-á ao servidor réplica.",
+"When switched on, ownCloud will only connect to the replica server." => "Quando ativado, ownCloud somente se conectará ao servidor de réplica.",
 "Use TLS" => "Usar TLS",
 "Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud.",
 "Not recommended, use for testing only." => "Não recomendado, use somente para testes.",
+"Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
 "Directory Settings" => "Configurações de Diretório",
 "User Display Name Field" => "Campo Nome de Exibição de Usuário",
 "The LDAP attribute to use to generate the user`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do usuário.",
 "Base User Tree" => "Árvore de Usuário Base",
 "One User Base DN per line" => "Um usuário-base DN por linha",
-"User Search Attributes" => "Atributos de busca de usuário",
+"User Search Attributes" => "Atributos de Busca de Usuário",
 "Optional; one attribute per line" => "Opcional; um atributo por linha",
 "Group Display Name Field" => "Campo Nome de Exibição de Grupo",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "O atributo LDAP para usar para gerar nome ownCloud do grupo.",
 "Base Group Tree" => "Árvore de Grupo Base",
 "One Group Base DN per line" => "Um grupo-base DN por linha",
-"Group Search Attributes" => "Atributos de busca de grupo",
+"Group Search Attributes" => "Atributos de Busca de Grupo",
 "Group-Member association" => "Associação Grupo-Membro",
 "Special Attributes" => "Atributos Especiais",
+"Quota Field" => "Campo de Cota",
+"Quota Default" => "Cota Padrão",
 "in bytes" => "em bytes",
+"Email Field" => "Campo de Email",
+"User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+"Test Configuration" => "Teste de Configuração",
 "Help" => "Ajuda"
 );

apps/user_ldap/l10n/pt_PT.php

@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud.",
 "Not recommended, use for testing only." => "Não recomendado, utilizado apenas para testes!",
+"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
 "Directory Settings" => "Definições de directorias",
 "User Display Name Field" => "Mostrador do nome de utilizador.",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
 "Group-Member association" => "Associar utilizador ao grupo.",
 "Special Attributes" => "Atributos especiais",
+"Quota Field" => "Quota",
+"Quota Default" => "Quota padrão",
 "in bytes" => "em bytes",
+"Email Field" => "Campo de email",
+"User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
+"Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda"
 );

apps/user_ldap/l10n/sv.php

@@ -63,7 +63,9 @@
 "Group Search Attributes" => "Gruppsökningsattribut",
 "Group-Member association" => "Attribut för gruppmedlemmar",
 "Special Attributes" => "Specialattribut",
+"Quota Field" => "Kvotfält",
 "in bytes" => "i bytes",
+"Email Field" => "E-postfält",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
 "Help" => "Hjälp"
 );

apps/user_ldap/l10n/uk.php

@@ -48,6 +48,7 @@
 "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер.",
 "Not recommended, use for testing only." => "Не рекомендується, використовуйте лише для тестів.",
+"Cache Time-To-Live" => "Час актуальності Кеша",
 "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
 "Directory Settings" => "Налаштування Каталога",
 "User Display Name Field" => "Поле, яке відображає Ім'я Користувача",
@@ -63,7 +64,12 @@
 "Group Search Attributes" => "Пошукові Атрибути Групи",
 "Group-Member association" => "Асоціація Група-Член",
 "Special Attributes" => "Спеціальні Атрибути",
+"Quota Field" => "Поле Квоти",
+"Quota Default" => "Квота за замовчанням",
 "in bytes" => "в байтах",
+"Email Field" => "Поле Ел. пошти",
+"User Home Folder Naming Rule" => "Правило іменування домашньої теки користувача",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
+"Test Configuration" => "Тестове налаштування",
 "Help" => "Допомога"
 );

apps/user_ldap/lib/access.php

@@ -144,6 +144,9 @@ abstract class Access {
 			'\;' => '\5c3B',
 			'\"' => '\5c22',
 			'\#' => '\5c23',
+			'('  => '\28',
+			')'  => '\29',
+			'*'  => '\2A',
 		);
 		$dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
 
@@ -650,7 +653,7 @@ abstract class Access {
 		$linkResources = array_pad(array(), count($base), $link_resource);
 		$sr = ldap_search($linkResources, $base, $filter, $attr);
 		$error = ldap_errno($link_resource);
-		if(!is_array($sr) || $error > 0) {
+		if(!is_array($sr) || $error != 0) {
 			\OCP\Util::writeLog('user_ldap',
 				'Error when searching: '.ldap_error($link_resource).' code '.ldap_errno($link_resource),
 				\OCP\Util::ERROR);

apps/user_ldap/settings.php

@@ -42,17 +42,7 @@ OCP\Util::addstyle('user_ldap', 'settings');
 $tmpl = new OCP\Template('user_ldap', 'settings');
 
 $prefixes = \OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes();
-$scoHtml = '';
+$tmpl->assign('serverConfigurationPrefixes', $prefixes);
-$i = 1;
-$sel = ' selected';
-foreach($prefixes as $prefix) {
-	$scoHtml .= '<option value="'.$prefix.'"'.$sel.'>'.$i++.'. Server</option>';
-	$sel = '';
-}
-if(count($prefixes) == 0) {
-	$scoHtml .= '<option value="" selected>1. Server</option>';
-}
-$tmpl->assign('serverConfigurationOptions', $scoHtml);
 
 // assign default values
 if(!isset($ldap)) {

apps/user_ldap/templates/settings.php

@@ -14,7 +14,20 @@
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_serverconfig_chooser"><?php p($l->t('Server configuration'));?></label>
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
-		<?php p($_['serverConfigurationOptions']); ?>
+		<?php if(count($_['serverConfigurationPrefixes']) == 0 ) {
+			?>
+				<option value="" selected>1. Server</option>');
+			<?php
+		} else {
+			$i = 1;
+			$sel = ' selected';
+			foreach($_['serverConfigurationPrefixes'] as $prefix) {
+				?>
+				<option value="<?php p($prefix); ?>"<?php p($sel); ?>><?php p($i++); ?>. Server</option>
+				<?php
+			}
+		}
+		?>
 		<option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
 		</select>
 		<button id="ldap_action_delete_configuration"

apps/user_webdavauth/appinfo/app.php

@@ -21,7 +21,7 @@
 *
 */
 
-require_once 'apps/user_webdavauth/user_webdavauth.php';
+require_once OC_App::getAppPath('user_webdavauth').'/user_webdavauth.php';
 
 OC_APP::registerAdmin('user_webdavauth', 'settings');
 

core/ajax/update.php

@@ -17,10 +17,6 @@ if (OC::checkUpgrade(false)) {
 	} catch (Exception $exception) {
 		$watcher->failure($exception->getMessage());
 	}
-	$minimizerCSS = new OC_Minimizer_CSS();
-	$minimizerCSS->clearCache();
-	$minimizerJS = new OC_Minimizer_JS();
-	$minimizerJS->clearCache();
 	OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 	OC_App::checkAppsRequirements();
 	// load all apps to also upgrade enabled apps

core/css/styles.css

@@ -32,12 +32,12 @@ background:linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */
 filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ }
 
 #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
-.header-right { float:right; vertical-align:middle; padding:0 0.5em; }
+.header-right { float:right; vertical-align:middle; padding:0.5em; }
 .header-right > * { vertical-align:middle; }
 
+
 /* INPUTS */
-input[type="text"], input[type="password"], input[type="number"] { cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"],
-input[type="text"], input[type="password"], input[type="search"], input[type="number"],
 textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
 	width:10em; margin:.3em; padding:.6em .5em .4em;
 	font-size:1em; font-family:Arial, Verdana, sans-serif;
@@ -46,13 +46,22 @@ textarea, select, button, .button, #quota, div.jp-progress, .pager li a {
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
 input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], input[type="number"], textarea { background:#f8f8f8; color:#555; cursor:text; }
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea {
-input[type="text"], input[type="password"], input[type="search"], input[type="number"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
+	background:#f8f8f8; color:#555; cursor:text;
+}
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] {
+	-webkit-appearance:textfield; -moz-appearance:textfield;
+	-webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box;
+}
 input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
 input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
-textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
+textarea:hover, textarea:focus, textarea:active {
+	background-color:#fff; color:#333;
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1;
+}
 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
 #quota { cursor:default; }

core/js/js.js

@@ -349,7 +349,7 @@ OC.Notification={
 	},
 	show: function(text) {
 		if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
-			$('#notification').html(html);
+			$('#notification').html(text);
 			$('#notification').fadeIn().css("display","inline");
 		}else{
 			OC.Notification.queuedNotifications.push($(text).html());

core/js/oc-dialogs.js

@@ -129,13 +129,13 @@ var OCdialogs = {
 					var p;
 					if ($(c_id).data('multiselect') == true) {
 						p = [];
-						$(c_id+' .filepicker_element_selected #filename').each(function(i, elem) {
+						$(c_id+' .filepicker_element_selected .filename').each(function(i, elem) {
 							p.push(($(c_id).data('path')?$(c_id).data('path'):'')+'/'+$(elem).text());
 						});
 					} else {
 						var p = $(c_id).data('path');
 						if (p == undefined) p = '';
-						p = p+'/'+$(c_id+' .filepicker_element_selected #filename').text()
+						p = p+'/'+$(c_id+' .filepicker_element_selected .filename').text()
 					}
 					callback(p);
 					$(c_id).dialog('close');
@@ -216,13 +216,15 @@ var OCdialogs = {
 		}
 	},
 	fillFilePicker:function(r, dialog_content_id) {
-		var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
+		var entry_template = '<div data-entryname="*ENTRYNAME*" data-dcid="'+dialog_content_id+'" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span class="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
 		var names = '';
 		$.each(r.data, function(index, a) {
 			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type);
 		});
 		
-		$(dialog_content_id + ' #filelist').html(names);
+		$(dialog_content_id + ' #filelist').html(names).on('click', '[data="file"]', function() {
+			OC.dialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid'));
+		});
 		$(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
 	},
 	handleTreeListSelect:function(event) {

core/l10n/id.php

@@ -1,6 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Category type not provided." => "Tipe kategori tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
+"This category already exists: %s" => "Kategori ini sudah ada: %s",
+"Object type not provided." => "Tipe obyek tidak diberikan.",
+"%s ID not provided." => "%s ID tidak diberikan.",
+"Error adding %s to favorites." => "Kesalahan menambah %s ke favorit",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Error removing %s from favorites." => "Kesalahan menghapus %s dari favorit",
 "Sunday" => "minggu",
 "Monday" => "senin",
 "Tuesday" => "selasa",
@@ -23,9 +29,14 @@
 "Settings" => "Setelan",
 "seconds ago" => "beberapa detik yang lalu",
 "1 minute ago" => "1 menit lalu",
+"{minutes} minutes ago" => "{minutes} menit yang lalu",
+"1 hour ago" => "1 jam yang lalu",
+"{hours} hours ago" => "{hours} jam yang lalu",
 "today" => "hari ini",
 "yesterday" => "kemarin",
+"{days} days ago" => "{days} hari yang lalu",
 "last month" => "bulan kemarin",
+"{months} months ago" => "{months} bulan yang lalu",
 "months ago" => "beberapa bulan lalu",
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
@@ -35,7 +46,8 @@
 "Yes" => "Ya",
 "Ok" => "Oke",
 "Error" => "gagal",
-"Share" => "berbagi",
+"Shared" => "Terbagi",
+"Share" => "Bagi",
 "Error while sharing" => "gagal ketika membagikan",
 "Error while unsharing" => "gagal ketika membatalkan pembagian",
 "Error while changing permissions" => "gagal ketika merubah perijinan",
@@ -45,6 +57,8 @@
 "Share with link" => "bagikan dengan tautan",
 "Password protect" => "lindungi dengan kata kunci",
 "Password" => "Password",
+"Email link to person" => "Email link ini ke orang",
+"Send" => "Kirim",
 "Set expiration date" => "set tanggal kadaluarsa",
 "Expiration date" => "tanggal kadaluarsa",
 "Share via email:" => "berbagi memlalui surel:",
@@ -61,9 +75,13 @@
 "Password protected" => "dilindungi kata kunci",
 "Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa",
 "Error setting expiration date" => "gagal memasang tanggal kadaluarsa",
+"Sending ..." => "Sedang mengirim ...",
+"Email sent" => "Email terkirim",
+"The update was successful. Redirecting you to ownCloud now." => "Update sukses. Membawa anda ke ownCloud sekarang.",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
+"Request failed!" => "Permintaan gagal!",
 "Username" => "Username",
 "Request reset" => "Meminta reset",
 "Your password was reset" => "Password anda telah direset",
@@ -100,6 +118,7 @@
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
+"Alternative Logins" => "Login dengan cara lain",
 "prev" => "sebelum",
 "next" => "selanjutnya"
 );

core/lostpassword/templates/lostpassword.php

@@ -9,7 +9,7 @@
 			<?php endif; ?>
 			<p class="infield">
 				<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
-				<input type="text" name="user" id="user" value="" autocomplete="off" required autofocus />
+				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 			</p>
 			<input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" />
 		<?php endif; ?>

core/templates/error.php

@@ -2,7 +2,7 @@
 	<?php foreach($_["errors"] as $error):?>
 		<li class='error'>
 			<?php p($error['error']) ?><br/>
-			<p class='hint'><?php if(isset($error['hint']))p($error['hint']) ?></p>
+			<p class='hint'><?php if(isset($error['hint']))print_unescaped($error['hint']) ?></p>
 		</li>
 	<?php endforeach ?>
 </ul>

core/templates/installation.php

@@ -36,13 +36,13 @@
 	<fieldset id="adminaccount">
 		<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
 		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin"
+			<input type="text" name="adminlogin" id="adminlogin" placeholder=""
 				value="<?php p(OC_Helper::init_var('adminlogin')); ?>" autocomplete="off" autofocus required />
 			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
 			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
-			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder=""
 				value="<?php p(OC_Helper::init_var('adminpass')); ?>" />
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" />
@@ -127,17 +127,17 @@
 		<div id="use_other_db">
 			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
-				<input type="text" name="dbuser" id="dbuser"
+				<input type="text" name="dbuser" id="dbuser" placeholder=""
 					value="<?php p(OC_Helper::init_var('dbuser')); ?>" autocomplete="off" />
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
-				<input type="password" name="dbpass" id="dbpass"
+				<input type="password" name="dbpass" id="dbpass" placeholder=""
 					value="<?php p(OC_Helper::init_var('dbpass')); ?>" />
 			</p>
 			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
-				<input type="text" name="dbname" id="dbname"
+				<input type="text" name="dbname" id="dbname" placeholder=""
 					value="<?php p(OC_Helper::init_var('dbname')); ?>"
 					autocomplete="off" pattern="[0-9a-zA-Z$_-]+" />
 			</p>
@@ -147,14 +147,14 @@
 		<div id="use_oracle_db">
 			<p class="infield groupmiddle">
 				<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
-				<input type="text" name="dbtablespace" id="dbtablespace"
+				<input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
 					value="<?php p(OC_Helper::init_var('dbtablespace')); ?>" autocomplete="off" />
 			</p>
 		</div>
 		<?php endif; ?>
 		<p class="infield groupbottom">
 			<label for="dbhost" class="infield" id="dbhostlabel"><?php p($l->t( 'Database host' )); ?></label>
-			<input type="text" name="dbhost" id="dbhost"
+			<input type="text" name="dbhost" id="dbhost" placeholder=""
 				value="<?php p(OC_Helper::init_var('dbhost', 'localhost')); ?>" />
 		</p>
 	</fieldset>

core/templates/login.php

@@ -22,7 +22,7 @@
 			<?php endif; ?>
 		</ul>
 		<p class="infield grouptop">
-			<input type="text" name="user" id="user"
+			<input type="text" name="user" id="user" placeholder=""
 				   value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?>
 				   autocomplete="on" required/>
 			<label for="user" class="infield"><?php p($l->t('Username')); ?></label>
@@ -30,7 +30,7 @@
 		</p>
 
 		<p class="infield groupbottom">
-			<input type="password" name="password" id="password" value="" data-typetoggle="#show"
+			<input type="password" name="password" id="password" value="" data-typetoggle="#show" placeholder=""
 				   required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> />
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>

l10n/af_ZA/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:14+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -74,3 +74,7 @@ msgstr ""
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/ar/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "اسم"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -74,3 +74,7 @@ msgstr ""
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "إلغاء"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/be/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-21 00:14+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:14+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr ""
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr ""
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr ""
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr ""
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr ""
 
@@ -74,3 +74,7 @@ msgstr ""
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/bg_BG/files_trashbin.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-03-03 16:00+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: Kiril <neohidra@gmail.com>\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,3 +76,7 @@ msgstr "Възтановяване"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Изтриване"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/bn_BD/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "রাম"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
@@ -74,3 +74,7 @@ msgstr ""
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "মুছে"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/ca/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "esborra el fitxer permanentment"
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nom"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fitxers"
 
@@ -75,3 +75,7 @@ msgstr "Recupera"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Esborra"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/cs_CZ/files.po

@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"PO-Revision-Date: 2013-03-04 07:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -281,7 +281,7 @@ msgstr "Zrušit odesílání"
 
 #: templates/index.php:53
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Nemáte zde práva zápisu."
 
 #: templates/index.php:60
 msgid "Nothing in here. Upload something!"

l10n/cs_CZ/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "trvale odstranit soubor"
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Název"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} soubory"
 
@@ -75,3 +75,7 @@ msgstr "Obnovit"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Smazat"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/cs_CZ/user_ldap.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"PO-Revision-Date: 2013-03-04 12:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "Selhalo smazání konfigurace serveru"
+msgstr "Selhalo smazání nastavení serveru"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
@@ -238,7 +238,7 @@ msgstr "Není doporučeno, pouze pro testovací účely."
 
 #: templates/settings.php:65
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "TTL vyrovnávací paměti"
 
 #: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
@@ -302,11 +302,11 @@ msgstr "Speciální atributy"
 
 #: templates/settings.php:79
 msgid "Quota Field"
-msgstr ""
+msgstr "Pole pro kvótu"
 
 #: templates/settings.php:80
 msgid "Quota Default"
-msgstr ""
+msgstr "Výchozí kvóta"
 
 #: templates/settings.php:80
 msgid "in bytes"
@@ -314,11 +314,11 @@ msgstr "v bajtech"
 
 #: templates/settings.php:81
 msgid "Email Field"
-msgstr ""
+msgstr "Pole e-mailu"
 
 #: templates/settings.php:82
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Pravidlo pojmenování domovské složky uživatele"
 
 #: templates/settings.php:82
 msgid ""
@@ -328,7 +328,7 @@ msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte L
 
 #: templates/settings.php:86
 msgid "Test Configuration"
-msgstr ""
+msgstr "Vyzkoušet nastavení"
 
 #: templates/settings.php:86
 msgid "Help"

l10n/da/files.po

@@ -10,15 +10,16 @@
 #   <osos@openeyes.dk>, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 #   <simon@rosmi.dk>, 2012.
+# Thomas <cronner@gmail.com>, 2013.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"PO-Revision-Date: 2013-03-04 18:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,7 +280,7 @@ msgstr "Fra link"
 
 #: templates/index.php:40
 msgid "Deleted files"
-msgstr ""
+msgstr "Slettede filer"
 
 #: templates/index.php:46
 msgid "Cancel upload"
@@ -287,7 +288,7 @@ msgstr "Fortryd upload"
 
 #: templates/index.php:53
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du har ikke skriverettigheder her."
 
 #: templates/index.php:60
 msgid "Nothing in here. Upload something!"

l10n/da/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "slet fil permanent"
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Navn"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Slettet"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} filer"
 
@@ -75,3 +75,7 @@ msgstr "Gendan"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Slet"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/da/files_versions.po

@@ -6,13 +6,14 @@
 # Frederik Lassen <frederiklassen@gmail.com>, 2013.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012.
 #   <osos@openeyes.dk>, 2012.
+# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-28 00:04+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-02-27 23:04+0000\n"
+"PO-Revision-Date: 2013-03-04 18:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,17 +44,17 @@ msgstr "fejl"
 msgid "File %s could not be reverted to version %s"
 msgstr "Filen %s blev genskabt til version: %s"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Ingen gamle version tilgængelige"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Ingen sti specificeret"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr ""
+msgstr "Versioner"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"

l10n/da/lib.po

@@ -7,13 +7,14 @@
 # Frederik Lassen <frederiklassen@gmail.com>, 2013.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2012-2013.
 #   <osos@openeyes.dk>, 2012.
+# Thomas <cronner@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"PO-Revision-Date: 2013-03-04 18:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: cronner <cronner@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -178,7 +179,7 @@ msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 #: setup.php:631
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
 
 #: setup.php:849
 msgid ""

l10n/da/settings.po

@@ -7,20 +7,21 @@
 # Frederik Lassen <frederiklassen@gmail.com>, 2013.
 #   <icewind1991@gmail.com>, 2012.
 #   <mikkelbjerglarsen@gmail.com>, 2011.
-# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2012.
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011-2013.
 # Ole Holm Frandsen <froksen@gmail.com>, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
 #   <simon@rosmi.dk>, 2012.
 #   <sr@ybnet.dk>, 2012-2013.
+# Thomas <cronner@gmail.com>, 2013.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-27 14:35+0100\n"
+"POT-Creation-Date: 2013-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-02-27 13:35+0000\n"
+"PO-Revision-Date: 2013-03-06 11:50+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -141,7 +142,7 @@ msgstr "fortryd"
 
 #: js/users.js:62
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Kan ikke fjerne bruger"
 
 #: js/users.js:75 templates/users.php:26 templates/users.php:80
 #: templates/users.php:105
@@ -158,19 +159,19 @@ msgstr "Slet"
 
 #: js/users.js:191
 msgid "add group"
-msgstr ""
+msgstr "Tilføj gruppe"
 
 #: js/users.js:352
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Et gyldigt brugernavn skal angives"
 
 #: js/users.js:353 js/users.js:359 js/users.js:374
 msgid "Error creating user"
-msgstr ""
+msgstr "Fejl ved oprettelse af bruger"
 
 #: js/users.js:358
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "En gyldig adgangskode skal angives"
 
 #: personal.php:29 personal.php:30
 msgid "__language_name__"
@@ -191,7 +192,7 @@ msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet.
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+msgstr "Opsætnings Advarsel"
 
 #: templates/admin.php:32
 msgid ""
@@ -206,17 +207,17 @@ msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "Module 'fileinfo' mangler"
 
 #: templates/admin.php:47
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr ""
+msgstr "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Landestandard fungerer ikke"
 
 #: templates/admin.php:63
 #, php-format
@@ -224,11 +225,11 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr ""
+msgstr "Denne ownCloud server kan ikke indstille systemets landestandard for %s. Det betyder, at der kan være problemer med visse tegn i filnavne. Vi anbefaler kraftigt, at installere de nødvendige pakker på dit system til at understøtte %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Internetforbindelse fungerer ikke"
 
 #: templates/admin.php:78
 msgid ""
@@ -238,90 +239,90 @@ msgid ""
 "remote and sending of notification emails might also not work. We suggest to"
 " enable internet connection for this server if you want to have all features"
 " of ownCloud."
-msgstr ""
+msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af eksterne applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker alle ownClouds funktioner."
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Udføre en opgave med hver side indlæst"
 
 #: templates/admin.php:111
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php er registreret hos en webcron service. Kald cron.php side i owncloud rod en gang i minuttet over HTTP."
 
 #: templates/admin.php:121
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Brug system cron service. Kald cron.php filen i owncloud mappe via et system cronjob en gang i minuttet."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "Deling"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver Share API"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillad apps til at bruge Share API"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "Tillad links"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillad videredeling"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillad brugere at dele elementer delt med dem igen"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillad brugere at dele med alle"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "Sikkerhed"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Gennemtving HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Håndhæver klienter at oprette forbindelse til ownCloud via en krypteret forbindelse."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Opret forbindelse til denne ownCloud enhed via HTTPS for at aktivere eller deaktivere SSL håndhævelse."
 
 #: templates/admin.php:195
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "Log niveau"
 
 #: templates/admin.php:223
 msgid "More"

l10n/de/files.po

@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-05 00:18+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"PO-Revision-Date: 2013-03-04 13:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -299,7 +299,7 @@ msgstr "Upload abbrechen"
 
 #: templates/index.php:53
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Du besitzt hier keine Schreib-Berechtigung."
 
 #: templates/index.php:60
 msgid "Nothing in here. Upload something!"

l10n/de/files_trashbin.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,27 +43,27 @@ msgstr "Datei dauerhaft löschen"
 msgid "Delete permanently"
 msgstr "Permanent löschen"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "gelöscht"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -78,3 +78,7 @@ msgstr "Wiederherstellen"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Löschen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/de_DE/files.po

@@ -33,9 +33,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"PO-Revision-Date: 2013-03-05 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -304,7 +304,7 @@ msgstr "Upload abbrechen"
 
 #: templates/index.php:53
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Sie haben hier keine Schreib-Berechtigungen."
 
 #: templates/index.php:60
 msgid "Nothing in here. Upload something!"

l10n/de_DE/files_external.po

@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-02-28 10:30+0000\n"
+"PO-Revision-Date: 2013-03-05 21:25+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

l10n/de_DE/files_trashbin.po

@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-23 00:04+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-22 23:00+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,27 +46,27 @@ msgstr "Datei dauerhaft löschen"
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Name"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -81,3 +81,7 @@ msgstr "Wiederherstellen"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Löschen"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/de_DE/files_versions.po

@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-02-28 10:20+0000\n"
+"PO-Revision-Date: 2013-03-05 21:26+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,11 +49,11 @@ msgstr "Fehlgeschlagen"
 msgid "File %s could not be reverted to version %s"
 msgstr "Die Datei %s konnte nicht zur Version %s zurückgesetzt werden"
 
-#: history.php:68
+#: history.php:69
 msgid "No old versions available"
 msgstr "Keine älteren Versionen verfügbar"
 
-#: history.php:73
+#: history.php:74
 msgid "No path specified"
 msgstr "Kein Pfad angegeben"
 

l10n/de_DE/lib.po

@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-02-28 10:30+0000\n"
+"PO-Revision-Date: 2013-03-05 21:30+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -185,7 +185,7 @@ msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 #: setup.php:631
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr "MS SQL Benutzername und/oder Passwort nicht valide: %s"
+msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
 
 #: setup.php:849
 msgid ""

l10n/de_DE/settings.po

@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2011-2012.
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
 #   <blobbyjj@ymail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 # I Robot <owncloud-bot@tmit.eu>, 2012-2013.
@@ -30,9 +31,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-01 00:05+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-02-28 10:20+0000\n"
+"PO-Revision-Date: 2013-03-05 21:30+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -236,7 +237,7 @@ msgid ""
 "This ownCloud server can't set system locale to %s. This means that there "
 "might be problems with certain characters in file names. We strongly suggest"
 " to install the required packages on your system to support %s."
-msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen die für %s benötigten Pakete auf ihrem System zu installieren."
+msgstr "Dieser ownCloud Server kann die Ländereinstellung nicht auf %s ändern. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"

l10n/de_DE/user_ldap.po

@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
+"POT-Creation-Date: 2013-03-06 00:07+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"PO-Revision-Date: 2013-03-05 21:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -249,7 +249,7 @@ msgstr "Nicht empfohlen, nur zu Testzwecken."
 
 #: templates/settings.php:65
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Speichere Time-To-Live zwischen"
 
 #: templates/settings.php:65
 msgid "in seconds. A change empties the cache."
@@ -313,11 +313,11 @@ msgstr "Besondere Eigenschaften"
 
 #: templates/settings.php:79
 msgid "Quota Field"
-msgstr ""
+msgstr "Kontingent Feld"
 
 #: templates/settings.php:80
 msgid "Quota Default"
-msgstr ""
+msgstr "Kontingent Standard"
 
 #: templates/settings.php:80
 msgid "in bytes"
@@ -325,11 +325,11 @@ msgstr "in Bytes"
 
 #: templates/settings.php:81
 msgid "Email Field"
-msgstr ""
+msgstr "E-Mail Feld"
 
 #: templates/settings.php:82
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Benennungsregel für das Heimatverzeichnis des Benutzers"
 
 #: templates/settings.php:82
 msgid ""
@@ -339,7 +339,7 @@ msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall tra
 
 #: templates/settings.php:86
 msgid "Test Configuration"
-msgstr ""
+msgstr "Testkonfiguration"
 
 #: templates/settings.php:86
 msgid "Help"

l10n/el/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "μόνιμη διαγραφή αρχείου"
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Διαγράφηκε"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
@@ -75,3 +75,7 @@ msgstr "Επαναφορά"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Διαγραφή"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/eo/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nomo"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
@@ -74,3 +74,7 @@ msgstr "Restaŭri"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Forigi"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/es/files.po

@@ -12,6 +12,7 @@
 #   <karvayoEdgar@gmail.com>, 2013.
 # Ricardo A. Hermosilla Carrillo <ra.hermosillac@gmail.com>, 2013.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
+#  <sergioballesterossolanas@gmail.com>, 2013.
 #   <sergioballesterossolanas@gmail.com>, 2011-2012.
 #   <sergio@entrecables.com>, 2012.
 # Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
@@ -19,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-04 00:06+0100\n"
+"POT-Creation-Date: 2013-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-03 23:06+0000\n"
+"PO-Revision-Date: 2013-03-06 15:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -290,7 +291,7 @@ msgstr "Cancelar subida"
 
 #: templates/index.php:53
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "No tienes permisos para escribir aquí."
 
 #: templates/index.php:60
 msgid "Nothing in here. Upload something!"

l10n/es/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "Eliminar archivo permanentemente"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -75,3 +75,7 @@ msgstr "Recuperar"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Eliminar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/es/user_ldap.po

@@ -7,7 +7,7 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
 #   <manudeloz86@gmail.com>, 2012.
-# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012-2013.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
 #   <sergioballesterossolanas@gmail.com>, 2012.
 # Vladimir Martinez Sierra <vladimirmartinezsierra@gmail.com>, 2013.
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-03-02 00:03+0100\n"
+"POT-Creation-Date: 2013-03-07 00:16+0100\n"
-"PO-Revision-Date: 2013-03-01 23:04+0000\n"
+"PO-Revision-Date: 2013-03-06 21:20+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,248 +94,248 @@ msgstr "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistem
 msgid "Server configuration"
 msgstr "Configuración del Servidor"
 
-#: templates/settings.php:18
+#: templates/settings.php:31
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
-#: templates/settings.php:23
+#: templates/settings.php:36
 msgid "Host"
-msgstr "Máquina"
+msgstr "Servidor"
 
-#: templates/settings.php:25
+#: templates/settings.php:38
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
 
-#: templates/settings.php:26
+#: templates/settings.php:39
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:27
+#: templates/settings.php:40
 msgid "One Base DN per line"
 msgstr "Un DN Base por línea"
 
-#: templates/settings.php:28
+#: templates/settings.php:41
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
 
-#: templates/settings.php:30
+#: templates/settings.php:43
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:32
+#: templates/settings.php:45
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:33
+#: templates/settings.php:46
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:36
+#: templates/settings.php:49
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:37
+#: templates/settings.php:50
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:40
+#: templates/settings.php:53
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
 
-#: templates/settings.php:41
+#: templates/settings.php:54
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
 
-#: templates/settings.php:42
+#: templates/settings.php:55
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:58
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:46
+#: templates/settings.php:59
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin placeholder, ej: \"objectClass=person\"."
 
-#: templates/settings.php:47
+#: templates/settings.php:60
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:50
+#: templates/settings.php:63
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
-#: templates/settings.php:51
+#: templates/settings.php:64
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:55
+#: templates/settings.php:68
 msgid "Connection Settings"
 msgstr "Configuracion de coneccion"
 
-#: templates/settings.php:57
+#: templates/settings.php:70
 msgid "Configuration Active"
 msgstr "Configuracion activa"
 
-#: templates/settings.php:57
+#: templates/settings.php:70
 msgid "When unchecked, this configuration will be skipped."
 msgstr "Cuando deseleccione, esta configuracion sera omitida."
 
-#: templates/settings.php:58
+#: templates/settings.php:71
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:59
+#: templates/settings.php:72
 msgid "Backup (Replica) Host"
 msgstr "Host para backup (Replica)"
 
-#: templates/settings.php:59
+#: templates/settings.php:72
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
 
-#: templates/settings.php:60
+#: templates/settings.php:73
 msgid "Backup (Replica) Port"
 msgstr "Puerto para backup (Replica)"
 
-#: templates/settings.php:61
+#: templates/settings.php:74
 msgid "Disable Main Server"
 msgstr "Deshabilitar servidor principal"
 
-#: templates/settings.php:61
+#: templates/settings.php:74
 msgid "When switched on, ownCloud will only connect to the replica server."
 msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
 
-#: templates/settings.php:62
+#: templates/settings.php:75
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:62
+#: templates/settings.php:75
 msgid "Do not use it additionally for LDAPS connections, it will fail."
 msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
 
-#: templates/settings.php:63
+#: templates/settings.php:76
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:64
+#: templates/settings.php:77
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:64
+#: templates/settings.php:77
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
 
-#: templates/settings.php:64
+#: templates/settings.php:77
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:65
+#: templates/settings.php:78
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Cache TTL"
 
-#: templates/settings.php:65
+#: templates/settings.php:78
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Un cambio vacía la cache."
 
-#: templates/settings.php:67
+#: templates/settings.php:80
 msgid "Directory Settings"
 msgstr "Configuracion de directorio"
 
-#: templates/settings.php:69
+#: templates/settings.php:82
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:69
+#: templates/settings.php:82
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:70
+#: templates/settings.php:83
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:70
+#: templates/settings.php:83
 msgid "One User Base DN per line"
 msgstr "Un DN Base de Usuario por línea"
 
-#: templates/settings.php:71
+#: templates/settings.php:84
 msgid "User Search Attributes"
 msgstr "Atributos de la busqueda de usuario"
 
-#: templates/settings.php:71 templates/settings.php:74
+#: templates/settings.php:84 templates/settings.php:87
 msgid "Optional; one attribute per line"
 msgstr "Opcional; un atributo por linea"
 
-#: templates/settings.php:72
+#: templates/settings.php:85
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:72
+#: templates/settings.php:85
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:73
+#: templates/settings.php:86
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:73
+#: templates/settings.php:86
 msgid "One Group Base DN per line"
 msgstr "Un DN Base de Grupo por línea"
 
-#: templates/settings.php:74
+#: templates/settings.php:87
 msgid "Group Search Attributes"
 msgstr "Atributos de busqueda de grupo"
 
-#: templates/settings.php:75
+#: templates/settings.php:88
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:77
+#: templates/settings.php:90
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:79
+#: templates/settings.php:92
 msgid "Quota Field"
-msgstr ""
+msgstr "Cuota"
 
-#: templates/settings.php:80
+#: templates/settings.php:93
 msgid "Quota Default"
-msgstr ""
+msgstr "Cuota por defecto"
 
-#: templates/settings.php:80
+#: templates/settings.php:93
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:81
+#: templates/settings.php:94
 msgid "Email Field"
-msgstr ""
+msgstr "E-mail"
 
-#: templates/settings.php:82
+#: templates/settings.php:95
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:82
+#: templates/settings.php:95
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:86
+#: templates/settings.php:99
 msgid "Test Configuration"
-msgstr ""
+msgstr "Configuración de prueba"
 
-#: templates/settings.php:86
+#: templates/settings.php:99
 msgid "Help"
 msgstr "Ayuda"

l10n/es_AR/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "Borrar archivo de manera permanente"
 msgid "Delete permanently"
 msgstr "Borrar de manera permanente"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nombre"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Borrado"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} archivos"
 
@@ -75,3 +75,7 @@ msgstr "Recuperar"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Borrar"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/et_EE/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "kustuta fail jäädavalt"
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Nimi"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} faili"
 
@@ -75,3 +75,7 @@ msgstr "Taasta"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Kustuta"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/eu/files_trashbin.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -40,27 +40,27 @@ msgstr "ezabatu fitxategia betirako"
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "Izena"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
@@ -75,3 +75,7 @@ msgstr "Berrezarri"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "Ezabatu"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""

l10n/fa/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-02-22 00:06+0100\n"
+"POT-Creation-Date: 2013-03-08 00:25+0100\n"
-"PO-Revision-Date: 2013-02-20 23:32+0000\n"
+"PO-Revision-Date: 2013-03-07 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -39,27 +39,27 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
-#: js/trash.js:151 templates/index.php:17
+#: js/trash.js:174 templates/index.php:17
 msgid "Name"
 msgstr "نام"
 
-#: js/trash.js:152 templates/index.php:27
+#: js/trash.js:175 templates/index.php:27
 msgid "Deleted"
 msgstr ""
 
-#: js/trash.js:161
+#: js/trash.js:184
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/trash.js:163
+#: js/trash.js:186
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/trash.js:171
+#: js/trash.js:194
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/trash.js:173
+#: js/trash.js:196
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
@@ -74,3 +74,7 @@ msgstr "بازیابی"
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
 msgstr "حذف"
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""