diff options
Diffstat (limited to 'apps')
25 files changed, 83 insertions, 41 deletions
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 3f626d95647..e87872a4a09 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -1,12 +1,12 @@ <?php $TRANSLATIONS = array( -"Could not move %s - File with this name already exists" => "Nelze přesunout %s - existuje soubor se stejným názvem", +"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem", "Could not move %s" => "Nelze přesunout %s", "Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.", "Invalid Token" => "Neplatný token", -"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba", +"No file was uploaded. Unknown error" => "Žádný soubor nebyl odeslán. Neznámá chyba", "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML", "The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně", "No file was uploaded" => "Žádný soubor nebyl odeslán", "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", @@ -14,11 +14,11 @@ "Not enough storage available" => "Nedostatek dostupného úložného prostoru", "Invalid directory." => "Neplatný adresář", "Files" => "Soubory", -"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář, nebo je jeho velikost 0 bajtů", -"Not enough space available" => "Nedostatek dostupného místa", +"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo jeho velikost je 0 bajtů", +"Not enough space available" => "Nedostatek volného místa", "Upload cancelled." => "Odesílání zrušeno.", -"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.", -"URL cannot be empty." => "URL nemůže být prázdná", +"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.", +"URL cannot be empty." => "URL nemůže být prázdná.", "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno", "Error" => "Chyba", "Share" => "Sdílet", @@ -31,7 +31,7 @@ "suggest name" => "navrhnout název", "cancel" => "zrušit", "replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}", -"undo" => "zpět", +"undo" => "vrátit zpět", "perform delete operation" => "provést smazání", "1 file uploading" => "odesílá se 1 soubor", "files uploading" => "soubory se odesílají", @@ -40,15 +40,15 @@ "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.", "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.", "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)", -"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké může to chvíli trvat.", -"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud", +"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.", +"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Neplatný název složky. Pojmenování 'Shared' je rezervováno pro vnitřní potřeby ownCloud", "Name" => "Název", "Size" => "Velikost", "Modified" => "Upraveno", "1 folder" => "1 složka", -"{count} folders" => "{count} složky", +"{count} folders" => "{count} složek", "1 file" => "1 soubor", -"{count} files" => "{count} soubory", +"{count} files" => "{count} souborů", "%s could not be renamed" => "%s nemůže být přejmenován", "Upload" => "Odeslat", "File handling" => "Zacházení se soubory", diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php index 7b2ce2d65c5..4dd06280d87 100644 --- a/apps/files_encryption/l10n/cs_CZ.php +++ b/apps/files_encryption/l10n/cs_CZ.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno zvně systému ownCloud (např. ve vašem firemním adresáři). Můžete opravit vaše heslo soukromého klíče ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.", "Missing requirements." => "Nesplněné závislosti.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP verze PHP 5.3.3 s nainstalovaným a správně nastaveným rozšířením OpenSSL. Prozatím byla šifrovací aplikace zablokována.", +"Following users are not set up for encryption:" => "Následující uživatelé nejsou připraveni k zakódování:", "Saving..." => "Ukládám...", "Your private key is not valid! Maybe the your password was changed from outside." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno zvenčí.", "You can unlock your private key in your " => "Můžete odemknout váš soukromý klíč ve vašem", diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php index db6f57bb36d..7b3ad526734 100644 --- a/apps/files_encryption/l10n/gl.php +++ b/apps/files_encryption/l10n/gl.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros", "Missing requirements." => "Non se cumpren os requisitos.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que a extensión OpenSSL PHP estea activada e configurada correctamente. Polo de agora foi desactivado o aplicativo de cifrado.", +"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:", "Saving..." => "Gardando...", "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ", "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus", diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php index 8d15d1ced36..db1a1b1709a 100644 --- a/apps/files_encryption/l10n/it.php +++ b/apps/files_encryption/l10n/it.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La chiave privata non è valida! Forse la password è stata cambiata esternamente al sistema di ownCloud (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.", "Missing requirements." => "Requisiti mancanti.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.", +"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:", "Saving..." => "Salvataggio in corso...", "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.", "You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue", diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php index 1563243c993..3404ce4a542 100644 --- a/apps/files_encryption/l10n/pt_BR.php +++ b/apps/files_encryption/l10n/pt_BR.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.", "Missing requirements." => "Requisitos em falta.", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.", +"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:", "Saving..." => "Salvando...", "Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.", "You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas", diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php index 2cef6686fce..785d46cdc76 100644 --- a/apps/files_encryption/l10n/sv.php +++ b/apps/files_encryption/l10n/sv.php @@ -10,6 +10,7 @@ "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.", "Missing requirements." => "Krav som saknas", "Please make sure that PHP 5.3.3 or newer is installed and that the OpenSSL PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och rätt inställd. Kryperingsappen är därför tillsvidare inaktiverad.", +"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:", "Saving..." => "Sparar...", "Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.", "You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina", diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php index cf041726abe..3eebb39e7e8 100644 --- a/apps/files_sharing/l10n/cs_CZ.php +++ b/apps/files_sharing/l10n/cs_CZ.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.", "Password" => "Heslo", "Submit" => "Odeslat", +"Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.", +"Reasons might be:" => "Možné důvody:", +"the item was removed" => "položka byla odebrána", +"the link expired" => "odkazu vypršela platnost", +"sharing is disabled" => "sdílení je zakázané", +"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.", "%s shared the folder %s with you" => "%s s Vámi sdílí složku %s", "%s shared the file %s with you" => "%s s Vámi sdílí soubor %s", "Download" => "Stáhnout", diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php index 77332c183f6..601518e705d 100644 --- a/apps/files_sharing/l10n/ru.php +++ b/apps/files_sharing/l10n/ru.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.", "Password" => "Пароль", "Submit" => "Отправить", +"Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.", +"Reasons might be:" => "Причиной может быть:", +"the item was removed" => "объект был удалён", +"the link expired" => "срок ссылки истёк", +"sharing is disabled" => "обмен отключен", +"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку.", "%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас", "%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас", "Download" => "Скачать", diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php index dac5e33ec50..434a81ac28a 100644 --- a/apps/files_sharing/l10n/sv.php +++ b/apps/files_sharing/l10n/sv.php @@ -2,6 +2,12 @@ "The password is wrong. Try again." => "Lösenordet är fel. Försök igen.", "Password" => "Lösenord", "Submit" => "Skicka", +"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.", +"Reasons might be:" => "Orsaker kan vara:", +"the item was removed" => "objektet togs bort", +"the link expired" => "giltighet för länken har gått ut", +"sharing is disabled" => "delning är inaktiverat", +"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.", "%s shared the folder %s with you" => "%s delade mappen %s med dig", "%s shared the file %s with you" => "%s delade filen %s med dig", "Download" => "Ladda ner", diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 16c39ab3853..92361b65f63 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -13,7 +13,7 @@ $success = array(); $i = 0; foreach ($list as $file) { - if ( $dirlisting=='0') { + if ( $dirlisting === '0') { $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); $timestamp = substr($file, $delimiter+2); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 9d78f166765..e39004cc0d5 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -12,7 +12,7 @@ $success = array(); $i = 0; foreach ($list as $file) { - if ( $dirlisting=='0') { + if ( $dirlisting === '0') { $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); $timestamp = substr($file, $delimiter+2); diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 6f1c364737e..2dbaefe7a78 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -24,7 +24,7 @@ if ($dir) { $dirContent = $view->opendir($dir); $i = 0; while($entryName = readdir($dirContent)) { - if ( $entryName != '.' && $entryName != '..' ) { + if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) { $pos = strpos($dir.'/', '/', 1); $tmp = substr($dir, 0, $pos); $pos = strrpos($tmp, '.d'); @@ -54,13 +54,13 @@ foreach ($result as $r) { $i['timestamp'] = $r['timestamp']; $i['mimetype'] = $r['mime']; $i['type'] = $r['type']; - if ($i['type'] == 'file') { + if ($i['type'] === 'file') { $fileinfo = pathinfo($r['id']); $i['basename'] = $fileinfo['filename']; $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; } $i['directory'] = $r['location']; - if ($i['directory'] == '/') { + if ($i['directory'] === '/') { $i['directory'] = ''; } $i['permissions'] = OCP\PERMISSION_READ; @@ -68,9 +68,9 @@ foreach ($result as $r) { } function fileCmp($a, $b) { - if ($a['type'] == 'dir' and $b['type'] != 'dir') { + if ($a['type'] === 'dir' and $b['type'] !== 'dir') { return -1; - } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') { + } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') { return 1; } else { return strnatcasecmp($a['name'], $b['name']); @@ -83,7 +83,7 @@ usort($files, "fileCmp"); $pathtohere = ''; $breadcrumb = array(); foreach (explode('/', $dir) as $i) { - if ($i != '') { + if ($i !== '') { if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) { $name = $match[1]; } else { diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 409e3e59d5a..c3c958b07a7 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -16,7 +16,7 @@ $(document).ready(function() { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); } - if (result.status != 'success') { + if (result.status !== 'success') { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); @@ -44,7 +44,7 @@ $(document).ready(function() { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); } - if (result.status != 'success') { + if (result.status !== 'success') { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); @@ -75,7 +75,7 @@ $(document).ready(function() { var rows = $(this).parent().parent().parent().children('tr'); for (var i = start; i < end; i++) { $(rows).each(function(index) { - if (index == i) { + if (index === i) { var checkbox = $(this).children().children('input:checkbox'); $(checkbox).attr('checked', 'checked'); $(checkbox).parent().parent().addClass('selected'); @@ -114,7 +114,7 @@ $(document).ready(function() { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); } - if (result.status != 'success') { + if (result.status !== 'success') { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); @@ -142,7 +142,7 @@ $(document).ready(function() { var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); } - if (result.status != 'success') { + if (result.status !== 'success') { OC.dialogs.alert(result.data.message, t('core', 'Error')); } enableActions(); @@ -176,9 +176,9 @@ $(document).ready(function() { function processSelection(){ var selected=getSelectedFiles(); - var selectedFiles=selected.filter(function(el){return el.type=='file'}); - var selectedFolders=selected.filter(function(el){return el.type=='dir'}); - if(selectedFiles.length==0 && selectedFolders.length==0) { + var selectedFiles=selected.filter(function(el){return el.type === 'file'}); + var selectedFolders=selected.filter(function(el){return el.type === 'dir'}); + if(selectedFiles.length === 0 && selectedFolders.length === 0) { $('#headerName>span.name').text(t('files','Name')); $('#modified').text(t('files','Deleted')); $('table').removeClass('multiselect'); @@ -188,7 +188,7 @@ function processSelection(){ $('.selectedActions').show(); var selection=''; if(selectedFolders.length>0){ - if(selectedFolders.length==1){ + if(selectedFolders.length === 1){ selection+=t('files','1 folder'); }else{ selection+=t('files','{count} folders',{count: selectedFolders.length}); @@ -198,7 +198,7 @@ function processSelection(){ } } if(selectedFiles.length>0){ - if(selectedFiles.length==1){ + if(selectedFiles.length === 1){ selection+=t('files','1 file'); }else{ selection+=t('files','{count} files',{count: selectedFiles.length}); diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php index 91844a14b66..a0a55eced85 100644 --- a/apps/files_trashbin/l10n/nl.php +++ b/apps/files_trashbin/l10n/nl.php @@ -11,6 +11,7 @@ "{count} folders" => "{count} mappen", "1 file" => "1 bestand", "{count} files" => "{count} bestanden", +"restored" => "hersteld", "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!", "Restore" => "Herstellen", "Delete" => "Verwijder", diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php index ba85158b70e..044d324c5ab 100644 --- a/apps/files_trashbin/l10n/pt_PT.php +++ b/apps/files_trashbin/l10n/pt_PT.php @@ -11,6 +11,7 @@ "{count} folders" => "{count} pastas", "1 file" => "1 ficheiro", "{count} files" => "{count} ficheiros", +"restored" => "Restaurado", "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!", "Restore" => "Restaurar", "Delete" => "Eliminar", diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php index 0d55703cdc0..f77d82c7100 100644 --- a/apps/files_trashbin/l10n/ru.php +++ b/apps/files_trashbin/l10n/ru.php @@ -11,6 +11,7 @@ "{count} folders" => "{count} папок", "1 file" => "1 файл", "{count} files" => "{count} файлов", +"restored" => "восстановлен", "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!", "Restore" => "Восстановить", "Delete" => "Удалить", diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php index d56d8946f34..2e4a5b42612 100644 --- a/apps/files_trashbin/l10n/sv.php +++ b/apps/files_trashbin/l10n/sv.php @@ -11,6 +11,7 @@ "{count} folders" => "{count} mappar", "1 file" => "1 fil", "{count} files" => "{count} filer", +"restored" => "återställd", "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!", "Restore" => "Återskapa", "Delete" => "Radera", diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index ba940084a87..30913e00a47 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -265,14 +265,14 @@ class Trashbin { $query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`' . ' WHERE `user`=? AND `id`=? AND `timestamp`=?'); $result = $query->execute(array($user, $filename, $timestamp))->fetchAll(); - if (count($result) != 1) { + if (count($result) !== 1) { \OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR); return false; } // if location no longer exists, restore file in the root directory $location = $result[0]['location']; - if ($result[0]['location'] != '/' && + if ($result[0]['location'] !== '/' && (!$view->is_dir('files' . $result[0]['location']) || !$view->isUpdatable('files' . $result[0]['location']))) { $location = ''; diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index 66ec36df867..371765fa69a 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -5,7 +5,7 @@ </div> <div id='notification'></div> -<?php if (isset($_['files']) && count($_['files'])==0 && $_['dirlisting'] == false):?> +<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?> <div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div> <?php endif; ?> diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php index 85bb16ffa2d..8ecab58e5c8 100644 --- a/apps/files_trashbin/templates/part.breadcrumb.php +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -12,7 +12,7 @@ <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; $dir = \OCP\Util::encodePath($crumb["dir"]); ?> - <div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg" + <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> diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 94a8eec9515..254b08dd36a 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -7,7 +7,7 @@ $name = \OCP\Util::encodePath($file['name']); $directory = \OCP\Util::encodePath($file['directory']); ?> <tr data-filename="<?php p($file['name']);?>" - data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>" + data-type="<?php ($file['type'] === 'dir')?p('dir'):p('file')?>" data-mime="<?php p($file['mimetype'])?>" data-permissions='<?php p($file['permissions']); ?>' <?php if ( $_['dirlisting'] ): ?> @@ -22,14 +22,14 @@ data-dirlisting=0 <?php endif; ?>> <td class="filename svg" - <?php if($file['type'] == 'dir'): ?> + <?php if($file['type'] === 'dir'): ?> style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)" <?php else: ?> style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)" <?php endif; ?> > <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?> - <?php if($file['type'] == 'dir'): ?> + <?php if($file['type'] === 'dir'): ?> <?php if( $_['dirlisting'] ): ?> <a class="name" href="<?php p($_['baseURL'].'/'.$name); ?>" title=""> <?php else: ?> @@ -43,14 +43,14 @@ <?php endif; ?> <?php endif; ?> <span class="nametext"> - <?php if($file['type'] == 'dir'):?> + <?php if($file['type'] === 'dir'):?> <?php print_unescaped(htmlspecialchars($file['name']));?> <?php else:?> <?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span> <?php endif;?> </span> - <?php if($file['type'] == 'dir'):?> + <?php if($file['type'] === 'dir'):?> <span class="uploadtext" currentUploads="0"> </span> <?php endif;?> diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index d8a99c4980d..8846d58e499 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( "Could not revert: %s" => "元に戻せませんでした: %s", "Versions" => "バージョン", +"Failed to revert {file} to revision {timestamp}." => "{file} を {timestamp} のリヴィジョンに戻すことができません。", +"More versions..." => "もっと他のバージョン...", +"No other versions available" => "利用可能な他のバージョンはありません", "Restore" => "復元" ); diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php index 60bfd7829ed..2617ca414aa 100644 --- a/apps/user_ldap/l10n/sv.php +++ b/apps/user_ldap/l10n/sv.php @@ -15,6 +15,7 @@ "Connection test failed" => "Anslutningstestet misslyckades", "Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?", "Confirm Deletion" => "Bekräfta radering", +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.", "Server configuration" => "Serverinställning", "Add Server Configuration" => "Lägg till serverinställning", @@ -44,20 +45,24 @@ "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern", "Backup (Replica) Port" => "Säkerhetskopierins-port (Replika)", "Disable Main Server" => "Inaktivera huvudserver", +"Only connect to the replica server." => "Anslut endast till replikaservern.", "Use TLS" => "Använd TLS", "Do not use it additionally for LDAPS connections, it will fail." => "Använd inte för LDAPS-anslutningar, det kommer inte att fungera.", "Case insensitve LDAP server (Windows)" => "LDAP-servern är okänslig för gemener och versaler (Windows)", "Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.", +"If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Om anslutningen bara fungerar med detta alternativ, importera LDAP-serverns SSL-certifikat i din% s server.", "Not recommended, use for testing only." => "Rekommenderas inte, använd bara för test. ", "Cache Time-To-Live" => "Cache Time-To-Live", "in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.", "Directory Settings" => "Mappinställningar", "User Display Name Field" => "Attribut för användarnamn", +"The LDAP attribute to use to generate the user's display name." => "LDAP-attributet som ska användas för att generera användarens visningsnamn.", "Base User Tree" => "Bas för användare i katalogtjänst", "One User Base DN per line" => "En Användare start DN per rad", "User Search Attributes" => "Användarsökningsattribut", "Optional; one attribute per line" => "Valfritt; ett attribut per rad", "Group Display Name Field" => "Attribut för gruppnamn", +"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributet som ska användas för att generera gruppens visningsnamn.", "Base Group Tree" => "Bas för grupper i katalogtjänst", "One Group Base DN per line" => "En Grupp start DN per rad", "Group Search Attributes" => "Gruppsökningsattribut", @@ -70,10 +75,13 @@ "User Home Folder Naming Rule" => "Namnregel för hemkatalog", "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.", "Internal Username" => "Internt Användarnamn", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna: [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare", "Internal Username Attribute:" => "Internt Användarnamn Attribut:", "Override UUID detection" => "Åsidosätt UUID detektion", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.", "UUID Attribute:" => "UUID Attribut:", "Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!", "Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping", "Clear Groupname-LDAP Group Mapping" => "Rensa Gruppnamn-LDAP Group Mapping", "Test Configuration" => "Testa konfigurationen", diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php index 047bb148335..6dbbc8ce856 100644 --- a/apps/user_webdavauth/l10n/ja_JP.php +++ b/apps/user_webdavauth/l10n/ja_JP.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"WebDAV Authentication" => "WebDAV 認証" +"WebDAV Authentication" => "WebDAV 認証", +"Address: " => "アドレス:", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ユーザーの権限情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。" ); diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php index 95096ce7e95..6aae1c2e1a8 100644 --- a/apps/user_webdavauth/l10n/sv.php +++ b/apps/user_webdavauth/l10n/sv.php @@ -1,3 +1,5 @@ <?php $TRANSLATIONS = array( -"WebDAV Authentication" => "WebDAV Autentisering" +"WebDAV Authentication" => "WebDAV Autentisering", +"Address: " => "Adress: ", +"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter." ); |