aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files/css/mobile.css5
-rw-r--r--apps/files/css/upload.css10
-rw-r--r--apps/files/l10n/pt_PT.php48
-rw-r--r--apps/files_encryption/l10n/ast.php1
-rw-r--r--apps/files_encryption/l10n/cs_CZ.php1
-rw-r--r--apps/files_encryption/l10n/de.php1
-rw-r--r--apps/files_encryption/l10n/de_DE.php1
-rw-r--r--apps/files_encryption/l10n/en_GB.php1
-rw-r--r--apps/files_encryption/l10n/gl.php1
-rw-r--r--apps/files_encryption/l10n/it.php1
-rw-r--r--apps/files_encryption/l10n/ja.php1
-rw-r--r--apps/files_encryption/l10n/nb_NO.php2
-rw-r--r--apps/files_encryption/l10n/pt_BR.php1
-rw-r--r--apps/files_encryption/l10n/sk_SK.php1
-rw-r--r--apps/files_encryption/l10n/sv.php1
-rw-r--r--apps/files_encryption/l10n/tr.php1
-rw-r--r--apps/files_external/css/settings.css4
-rw-r--r--apps/files_external/js/settings.js17
-rw-r--r--apps/files_external/l10n/cs_CZ.php1
-rw-r--r--apps/files_external/l10n/en_GB.php4
-rw-r--r--apps/files_external/l10n/pt_PT.php9
-rw-r--r--apps/files_external/l10n/sk_SK.php1
-rw-r--r--apps/files_external/l10n/sv.php5
-rw-r--r--apps/files_external/templates/settings.php2
-rw-r--r--apps/files_sharing/css/authenticate.css8
-rw-r--r--apps/files_sharing/js/share.js2
-rw-r--r--apps/files_sharing/l10n/ast.php2
-rw-r--r--apps/files_sharing/l10n/pt_PT.php28
-rw-r--r--apps/files_sharing/l10n/sv.php2
-rw-r--r--apps/files_sharing/templates/authenticate.php1
-rw-r--r--apps/user_ldap/l10n/cs_CZ.php1
-rw-r--r--apps/user_ldap/l10n/pt_PT.php1
32 files changed, 118 insertions, 47 deletions
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 5e7d3875536..a0b92ca6949 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -62,4 +62,9 @@ table td.filename .nametext .innernametext {
display: -webkit-flex;
display: flex;
}
+
+/* shorten elements for mobile */
+#uploadprogressbar {
+ width: 50px;
+}
}
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index b28f2eac4ac..bdc258b5064 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -37,22 +37,26 @@
overflow: hidden;
}
-#uploadprogresswrapper {
+#uploadprogresswrapper, #uploadprogresswrapper * {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
+}
+
+#uploadprogresswrapper {
display: inline-block;
vertical-align: top;
height: 36px;
+ margin-left: 3px;
}
#uploadprogresswrapper > input[type='button'] {
height: 36px;
+ margin-left: 3px;
}
#uploadprogressbar {
position:relative;
float: left;
- margin-left: 12px;
- width: 100%;
+ width: 200px;
height: 36px;
display:inline-block;
}
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index ac12e047c54..a0b12db02c1 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome",
-"Could not move %s" => "Não foi possível move o ficheiro %s",
-"File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
+"Could not move %s - File with this name already exists" => "Não foi possível mover %s - Já existe um ficheiro com este nome",
+"Could not move %s" => "Não foi possível mover %s",
+"File name cannot be empty." => "O nome do ficheiro não pode estar em branco.",
"\"%s\" is an invalid file name." => "\"%s\" é um nome de ficheiro inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, Não são permitidos os carateres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*'.",
"The target folder has been moved or deleted." => "A pasta de destino foi movida ou eliminada.",
"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
"Not a valid source" => "Não é uma fonte válida",
@@ -15,18 +15,18 @@ $TRANSLATIONS = array(
"Error when creating the folder" => "Erro ao criar a pasta",
"Unable to set upload directory." => "Não foi possível criar o diretório de upload",
"Invalid Token" => "Token inválido",
-"No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi submetido com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro seleccionado foi apenas carregado parcialmente",
-"No file was uploaded" => "Nenhum ficheiro foi submetido",
-"Missing a temporary folder" => "Está a faltar a pasta temporária",
-"Failed to write to disk" => "Falhou a escrita no disco",
+"No file was uploaded. Unknown error" => "Não foi enviado nenhum ficheiro. Erro desconhecido",
+"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi enviado com sucesso",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a diretiva php.ini upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro enviado excede a diretiva MAX_FILE_SIZE definida no formulário HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro submetido só foi parcialmente enviado",
+"No file was uploaded" => "Não foi enviado nenhum ficheiro",
+"Missing a temporary folder" => "A pasta temporária está em falta",
+"Failed to write to disk" => "Não foi possível gravar no disco",
"Not enough storage available" => "Não há espaço suficiente em disco",
"Upload failed. Could not find uploaded file" => "Falhou o envio. Não conseguiu encontrar o ficheiro enviado",
"Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
-"Invalid directory." => "Directório Inválido",
+"Invalid directory." => "Diretoria inválida.",
"Files" => "Ficheiros",
"All files" => "Todos os ficheiros",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
@@ -34,17 +34,17 @@ $TRANSLATIONS = array(
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
"Upload cancelled." => "Envio cancelado.",
"Could not get result from server." => "Não foi possível obter o resultado do servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
"URL cannot be empty" => "URL não pode estar vazio",
"{new_name} already exists" => "O nome {new_name} já existe",
"Could not create file" => "Não pôde criar ficheiro",
"Could not create folder" => "Não pôde criar pasta",
"Error fetching URL" => "Erro ao obter URL",
-"Share" => "Partilhar",
-"Delete permanently" => "Eliminar permanentemente",
-"Delete" => "Eliminar",
+"Share" => "Compartilhar",
+"Delete permanently" => "Apagar Para Sempre",
+"Delete" => "Apagar",
"Rename" => "Renomear",
-"Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
+"Your download is being prepared. This might take some time if the files are big." => "A sua transferência está a ser preparada. Isto poderá demorar algum tempo, se os seus ficheiros forem grandes.",
"Pending" => "Pendente",
"Error moving file." => "Erro a mover o ficheiro.",
"Error moving file" => "Erro ao mover o ficheiro",
@@ -58,26 +58,26 @@ $TRANSLATIONS = array(
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de ficheiro inválido.",
-"Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
-"Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
+"Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
+"Your storage is almost full ({usedSpacePercent}%)" => "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados. Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
"{dirs} and {files}" => "{dirs} e {files}",
"%s could not be renamed" => "%s não pode ser renomeada",
"Upload (max. %s)" => "Enviar (max. %s)",
-"File handling" => "Manuseamento de ficheiros",
+"File handling" => "Manuseamento do ficheiro",
"Maximum upload size" => "Tamanho máximo de envio",
-"max. possible: " => "max. possivel: ",
+"max. possible: " => "Máx. possível: ",
"Save" => "Guardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
"New" => "Novo",
"New text file" => "Novo ficheiro de texto",
-"Text file" => "Ficheiro de texto",
+"Text file" => "Ficheiro de Texto",
"New folder" => "Nova Pasta",
"Folder" => "Pasta",
-"From link" => "Da ligação",
+"From link" => "Da hiperligação",
"Cancel upload" => "Cancelar envio",
"You don’t have permission to upload or create files here" => "Você não tem permissão para enviar ou criar ficheiros aqui",
"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index b6e663cf219..8185eadb0eb 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:",
"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.",
+"Go directly to your %spersonal settings%s." => "Dir direutamente a los tos %saxustes personales%s.",
"Encryption" => "Cifráu",
"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
"Recovery key password" => "Contraseña de clave de recuperación",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index f38e621abbe..f622885d2c0 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
"Initial encryption started... This can take some time. Please wait." => "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
"Initial encryption running... Please try again later." => "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
+"Go directly to your %spersonal settings%s." => "Přejít přímo do svého %sosobního nastaveni%s.",
"Encryption" => "Šifrování",
"Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
"Recovery key password" => "Heslo klíče pro obnovu",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 120e350e06c..5f978b8bab5 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." => "Initiale Verschlüsselung läuft... Bitte versuche es später wieder.",
+"Go directly to your %spersonal settings%s." => "Wechsle direkt zu Deinen %spersonal settings%s.",
"Encryption" => "Verschlüsselung",
"Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
"Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 52cc9de64dc..9d649697b01 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder.",
+"Go directly to your %spersonal settings%s." => "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Encryption" => "Verschlüsselung",
"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
"Recovery key password" => "Wiederherstellungschlüsselpasswort",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index 150173da63b..b2da4f2acdf 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Following users are not set up for encryption:",
"Initial encryption started... This can take some time. Please wait." => "Initial encryption started... This can take some time. Please wait.",
"Initial encryption running... Please try again later." => "Initial encryption running... Please try again later.",
+"Go directly to your %spersonal settings%s." => "Go directly to your %spersonal settings%s.",
"Encryption" => "Encryption",
"Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):",
"Recovery key password" => "Recovery key password",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 15ec92eaee7..1b044d6126f 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
"Initial encryption started... This can take some time. Please wait." => "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
"Initial encryption running... Please try again later." => "O cifrado inicial está en execución... Tenteo máis tarde.",
+"Go directly to your %spersonal settings%s." => "Vaia directamente aos seus %saxustes persoais%s.",
"Encryption" => "Cifrado",
"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
"Recovery key password" => "Contrasinal da chave de recuperación",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index c989c47a337..523c52475ea 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
"Initial encryption started... This can take some time. Please wait." => "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
"Initial encryption running... Please try again later." => "Cifratura iniziale in esecuzione... Riprova più tardi.",
+"Go directly to your %spersonal settings%s." => "Vai direttamente alle tue %simpostazioni personali%s.",
"Encryption" => "Cifratura",
"Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
"Recovery key password" => "Password della chiave di recupero",
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index fc9f15eaa08..930dad09a6d 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません:",
"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
"Initial encryption running... Please try again later." => "初期暗号化実行中... 後でもう一度お試しください。",
+"Go directly to your %spersonal settings%s." => "直接 %s個人設定%s に進む。",
"Encryption" => "暗号化",
"Enable recovery key (allow to recover users files in case of password loss):" => "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
"Recovery key password" => "リカバリキーのパスワード",
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index db9f36efac3..6d275c0b16b 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -15,7 +15,7 @@ $TRANSLATIONS = array(
"Missing requirements." => "Manglende krav.",
"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
"Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:",
-"Initial encryption started... This can take some time. Please wait." => "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
+"Initial encryption started... This can take some time. Please wait." => "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
"Initial encryption running... Please try again later." => "Førstegangs kryptering kjører... Prøv igjen senere.",
"Encryption" => "Kryptering",
"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index d1dcbd8956d..1a829352daf 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
"Initial encryption started... This can take some time. Please wait." => "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
"Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.",
+"Go directly to your %spersonal settings%s." => "Ir direto para suas %spersonal settings%s.",
"Encryption" => "Criptografia",
"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
"Recovery key password" => "Senha da chave de recuperação",
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 804b17f9155..685f960118c 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
"Initial encryption started... This can take some time. Please wait." => "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
"Initial encryption running... Please try again later." => "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
+"Go directly to your %spersonal settings%s." => "Prejsť priamo do svojho %sosobného nastavenia%s.",
"Encryption" => "Šifrovanie",
"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
"Recovery key password" => "Heslo obnovovacieho kľúča",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 76ed616ca5c..2360f8ff8cc 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
"Initial encryption started... This can take some time. Please wait." => "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.",
"Initial encryption running... Please try again later." => "Initiala krypteringen körs... Var god försök igen senare.",
+"Go directly to your %spersonal settings%s." => "Gå direkt till dina %segna inställningar%s.",
"Encryption" => "Kryptering",
"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
"Recovery key password" => "Lösenord för återställningsnyckel",
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 161caa18641..9964a44e742 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
"Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
"Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
+"Go directly to your %spersonal settings%s." => "Doğrudan %skişisel ayarlarınıza%s gidin.",
"Encryption" => "Şifreleme",
"Enable recovery key (allow to recover users files in case of password loss):" => "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
"Recovery key password" => "Kurtarma anahtarı parolası",
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 01dd5aece8c..758c52ae852 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -25,3 +25,7 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; }
#externalStorage td.status .success {
border-radius: 50%;
}
+
+#userMountingBackends {
+ padding-left: 25px;
+}
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 00793a614c2..348fecf0648 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -310,19 +310,28 @@ $(document).ready(function() {
OC.msg.startSaving('#userMountingMsg');
if (this.checked) {
OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
- $('#userMountingBackups').removeClass('hidden');
+ $('input[name="allowUserMountingBackends\\[\\]"]').prop('checked', true);
+ $('#userMountingBackends').removeClass('hidden');
+ $('input[name="allowUserMountingBackends\\[\\]"]').eq(0).trigger('change');
} else {
OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no');
- $('#userMountingBackups').addClass('hidden');
+ $('#userMountingBackends').addClass('hidden');
}
OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
});
$('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() {
OC.msg.startSaving('#userMountingMsg');
- var user_mounting_backends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
- OC.AppConfig.setValue('files_external', 'user_mounting_backends', user_mounting_backends.join());
+ var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
+ OC.AppConfig.setValue('files_external', 'user_mounting_backends', userMountingBackends.join());
OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
+
+ // disable allowUserMounting
+ if(userMountingBackends.length === 0) {
+ $('#allowUserMounting').prop('checked', false);
+ $('#allowUserMounting').trigger('change');
+
+ }
});
});
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 6e8ba8fec2a..8d93596ba6c 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
"You don't have any external storages" => "Nemáte žádná externí úložiště",
"Name" => "Název",
"Storage type" => "Typ úložiště",
+"Scope" => "Záběr",
"External Storage" => "Externí úložiště",
"Folder name" => "Název složky",
"Configuration" => "Nastavení",
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
index 74b53a867cc..e36c9496e42 100644
--- a/apps/files_external/l10n/en_GB.php
+++ b/apps/files_external/l10n/en_GB.php
@@ -46,13 +46,17 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.",
"Error configuring Google Drive storage" => "Error configuring Google Drive storage",
"Personal" => "Personal",
+"System" => "System",
"Saved" => "Saved",
"<b>Note:</b> " => "<b>Note:</b> ",
" and " => " and ",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+"You don't have any external storages" => "You don't have any external storage",
"Name" => "Name",
+"Storage type" => "Storage type",
+"Scope" => "Scope",
"External Storage" => "External Storage",
"Folder name" => "Folder name",
"Configuration" => "Configuration",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index af4f50d0243..244fc0464b4 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -8,9 +8,11 @@ $TRANSLATIONS = array(
"Secret" => "Secreto",
"Access Key" => "Chave de acesso",
"Secret Key" => "Chave Secreta",
+"Hostname (optional)" => "Nome do Hospedeiro (opcional)",
"Port (optional)" => "Porta (opcional)",
"Region (optional)" => "Região (opcional)",
"Enable SSL" => "Activar SSL",
+"Enable Path Style" => "Ativar Estilo do Caminho",
"App key" => "Chave da aplicação",
"App secret" => "Chave secreta da aplicação",
"Host" => "Endereço",
@@ -21,7 +23,11 @@ $TRANSLATIONS = array(
"Client ID" => "ID Cliente",
"Client secret" => "Segredo do cliente",
"Username (required)" => "Utilizador (requerido)",
+"Region (optional for OpenStack Object Storage)" => "Região (opcional para OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Senha (necessária para OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
"Share" => "Partilhar",
+"SMB / CIFS using OC login" => "SMB / CIFS utilizando o início de sessão OC",
"Username as share" => "Utilizar nome de utilizador como partilha",
"URL" => "URL",
"Secure https://" => "https:// Seguro",
@@ -32,13 +38,16 @@ $TRANSLATIONS = array(
"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",
"Personal" => "Pessoal",
+"System" => "Sistema",
"Saved" => "Guardado",
"<b>Note:</b> " => "<b>Aviso:</b> ",
" and " => "e",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
+"You don't have any external storages" => "Não possui quaisquer armazenamentos externos",
"Name" => "Nome",
+"Storage type" => "Tipo de Armazenamento",
"External Storage" => "Armazenamento Externo",
"Folder name" => "Nome da pasta",
"Configuration" => "Configuração",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 25425ad8c30..3d8e055745a 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -52,6 +52,7 @@ $TRANSLATIONS = array(
"You don't have any external storages" => "Nemáte žiadne externé úložisko",
"Name" => "Názov",
"Storage type" => "Typ úložiska",
+"Scope" => "Rozsah",
"External Storage" => "Externé úložisko",
"Folder name" => "Názov priečinka",
"Configuration" => "Nastavenia",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 9abead46222..7f45817c7e7 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
"Tenantname (required for OpenStack Object Storage)" => "Tenantname (krävs för OpenStack Object Storage)",
"Password (required for OpenStack Object Storage)" => "Lösenord (krävs för OpenStack Object Storage)",
"Service Name (required for OpenStack Object Storage)" => "Tjänstens namn (krävs för OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
"Timeout of HTTP requests in seconds (optional)" => "Timeout för HTTP-förfrågningar i sekunder (tillval)",
"Share" => "Dela",
"SMB / CIFS using OC login" => "SMB / CIFS använder OC inloggning",
@@ -45,13 +46,17 @@ $TRANSLATIONS = array(
"Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.",
"Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive",
"Personal" => "Personligt",
+"System" => "System",
"Saved" => "Sparad",
"<b>Note:</b> " => "<b> OBS: </ b>",
" and " => "och",
"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b> OBS: </ b> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
+"You don't have any external storages" => "Du har ingen extern extern lagring",
"Name" => "Namn",
+"Storage type" => "Lagringstyp",
+"Scope" => "Scope",
"External Storage" => "Extern lagring",
"Folder name" => "Mappnamn",
"Configuration" => "Konfiguration",
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index df80ed10993..98fcf4a0ed4 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -131,7 +131,7 @@
value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
- <p id="userMountingBackups"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
+ <p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
<?php p($l->t('Allow users to mount the following external storage')); ?><br />
<?php $i = 0; foreach ($_['personal_backends'] as $class => $backend): ?>
<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($class); ?>" <?php if ($backend['enabled']) print_unescaped(' checked="checked"'); ?> />
diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
index a5aa55632bb..15e3e7a2fc5 100644
--- a/apps/files_sharing/css/authenticate.css
+++ b/apps/files_sharing/css/authenticate.css
@@ -14,3 +14,11 @@ input[type='submit'] {
position: absolute;
top: 0px;
}
+
+fieldset > p {
+ position: relative;
+}
+
+#password-icon {
+ top: 20px;
+}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 47fe0bd2c57..0999bfd6bed 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -57,7 +57,7 @@
' data-action="Share-Notification" href="#" original-title="">' +
' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>';
$tr.find('.fileactions').append(function() {
- var shareBy = t('files_sharing', 'Shared by {owner}', {owner: fileData.shareOwner});
+ var shareBy = t('files_sharing', 'Shared by {owner}', {owner: escapeHTML(fileData.shareOwner)});
var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
$result.on('click', function() {
return false;
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
index 742245f5374..5672dd81b17 100644
--- a/apps/files_sharing/l10n/ast.php
+++ b/apps/files_sharing/l10n/ast.php
@@ -17,7 +17,7 @@ $TRANSLATIONS = array(
"Reasons might be:" => "Les razones pueden ser: ",
"the item was removed" => "desanicióse l'elementu",
"the link expired" => "l'enllaz caducó",
-"sharing is disabled" => "compartir ta desactiváu",
+"sharing is disabled" => "la compartición ta deshabilitada",
"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
"Download" => "Baxar",
"Download %s" => "Descargar %s",
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 03c57847d85..1af1f023fd7 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -2,21 +2,25 @@
$TRANSLATIONS = array(
"Shared with you" => "Partilhado consigo ",
"Shared with others" => "Partilhado com outros",
-"Shared by {owner}" => "Partilhado por {owner}",
+"Shared by link" => "Partilhado pela hiperligação",
+"No files have been shared with you yet." => "Ainda não partilhados quaisquer ficheuiros consigo.",
+"You haven't shared any files yet." => "Ainda não partilhou quaisquer ficheiros.",
+"You haven't shared any files by link yet." => "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+"Shared by {owner}" => "Partilhado por {dono}",
"Shared by" => "Partilhado por",
-"This share is password-protected" => "Esta partilha está protegida por palavra-chave",
-"The password is wrong. Try again." => "Password errada, por favor tente de novo",
-"Password" => "Palavra-passe",
+"This share is password-protected" => "Esta partilha está protegida por senha",
+"The password is wrong. Try again." => "A senha está errada. Por favor, tente de novo.",
+"Password" => "Senha",
"Name" => "Nome",
-"Share time" => "Partilhar hora",
-"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
+"Share time" => "Hora da Partilha",
+"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas esta hiperligação parece já não estar a funcionar.",
"Reasons might be:" => "As razões poderão ser:",
-"the item was removed" => "O item foi removido",
-"the link expired" => "O link expirou",
-"sharing is disabled" => "A partilha está desativada",
-"For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link",
+"the item was removed" => "o item foi removido",
+"the link expired" => "A hiperligação expirou",
+"sharing is disabled" => "a partilha está desativada",
+"For more info, please ask the person who sent this link." => "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
"Download" => "Transferir",
-"Download %s" => "Download %s",
-"Direct link" => "Link direto"
+"Download %s" => "Transferir %s",
+"Direct link" => "Hiperligação direta"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index e5fbd7a90af..19430c1ff95 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -2,8 +2,10 @@
$TRANSLATIONS = array(
"Shared with you" => "Delat med dig",
"Shared with others" => "Delat med andra",
+"Shared by link" => "Delad som länk",
"No files have been shared with you yet." => "Inga filer har ännu delats med dig.",
"You haven't shared any files yet." => "Du har inte delat några filer ännu.",
+"You haven't shared any files by link yet." => "Du har inte delat några filer som länk ännu.",
"Shared by {owner}" => "Delad av {owner}",
"Shared by" => "Delad av",
"This share is password-protected" => "Den här delningen är lösenordsskyddad",
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index f899a54e0f9..0c4ac6ca445 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -12,6 +12,7 @@
placeholder="<?php p($l->t('Password')); ?>" value=""
autocomplete="off" autocapitalize="off" autocorrect="off"
autofocus />
+ <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
<input type="submit" value="" class="svg icon-confirm" />
</p>
</fieldset>
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 52b8f84c6f4..254386aea7f 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -69,6 +69,7 @@ $TRANSLATIONS = array(
"users found" => "nalezení uživatelé",
"Back" => "Zpět",
"Continue" => "Pokračovat",
+"Expert" => "Expertní",
"Advanced" => "Pokročilé",
"<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 65f49d45dfe..5f4b3d5c15a 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Deletion failed" => "Erro ao apagar",
"Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
"Keep settings?" => "Manter as definições?",
+"{nthServer}. Server" => "{nthServer}. Servidor",
"Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
"mappings cleared" => "Mapas limpos",
"Success" => "Sucesso",