diff options
Diffstat (limited to 'apps')
32 files changed, 191 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9c4e43b3b8b..2516dd3e957 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -233,6 +233,7 @@ this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this)); this._onResize = _.debounce(_.bind(this._onResize, this), 100); + $('#app-content').on('appresized', this._onResize); $(window).resize(this._onResize); this.$el.on('show', this._onResize); @@ -278,6 +279,7 @@ this.fileActions.off('registerAction', this._onFileActionsUpdated); this.fileActions.off('setDefault', this._onFileActionsUpdated); OC.Plugins.detach('OCA.Files.FileList', this); + $('#app-content').off('appresized', this._onResize); }, /** @@ -437,6 +439,8 @@ this.breadcrumb.setMaxWidth(containerWidth - actionsWidth - 10); + this.$table.find('>thead').width($('#app-content').width() - OC.Util.getScrollBarWidth()); + this.updateSearch(); }, diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index a44c9f4fcd9..cf4bb0f5792 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s poisti kohteen %1$s", "You restored %1$s" : "Palautit kohteen %1$s", "%2$s restored %1$s" : "%2$s palautti kohteen %1$s", + "Changed by %2$s" : "Muuttanut %2$s", + "Deleted by %2$s" : "Poistanut %2$s", + "Restored by %2$s" : "Palauttanut %2$s", "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu", "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui", "Upload (max. %s)" : "Lähetys (enintään %s)", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index 7528802b94b..56417b3c74d 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s poisti kohteen %1$s", "You restored %1$s" : "Palautit kohteen %1$s", "%2$s restored %1$s" : "%2$s palautti kohteen %1$s", + "Changed by %2$s" : "Muuttanut %2$s", + "Deleted by %2$s" : "Poistanut %2$s", + "Restored by %2$s" : "Palauttanut %2$s", "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu", "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui", "Upload (max. %s)" : "Lähetys (enintään %s)", diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index 681940955dc..c8286c66a57 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s ha eliminato %1$s", "You restored %1$s" : "Hai ripristinato %1$s", "%2$s restored %1$s" : "%2$s ha ripristinato %1$s", + "Changed by %2$s" : "Modificata da %2$s", + "Deleted by %2$s" : "Eliminata da %2$s", + "Restored by %2$s" : "Ripristinata da %2$s", "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato", "%s could not be renamed" : "%s non può essere rinominato", "Upload (max. %s)" : "Carica (massimo %s)", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 1075d43e984..6f6092c5c15 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s ha eliminato %1$s", "You restored %1$s" : "Hai ripristinato %1$s", "%2$s restored %1$s" : "%2$s ha ripristinato %1$s", + "Changed by %2$s" : "Modificata da %2$s", + "Deleted by %2$s" : "Eliminata da %2$s", + "Restored by %2$s" : "Ripristinata da %2$s", "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato", "%s could not be renamed" : "%s non può essere rinominato", "Upload (max. %s)" : "Carica (massimo %s)", diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index 87b7d0e655c..d5090d57bde 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s 님이 %1$s을(를) 삭제함", "You restored %1$s" : "내가 %1$s을(를) 복원함", "%2$s restored %1$s" : "%2$s 님이 %1$s을(를) 복원함", + "Changed by %2$s" : "%2$s 님이 변경함", + "Deleted by %2$s" : "%2$s 님이 삭제함", + "Restored by %2$s" : "%2$s 님이 복원함", "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", "Upload (max. %s)" : "업로드(최대 %s)", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index 8a9dc1cf432..92ea053f64f 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s 님이 %1$s을(를) 삭제함", "You restored %1$s" : "내가 %1$s을(를) 복원함", "%2$s restored %1$s" : "%2$s 님이 %1$s을(를) 복원함", + "Changed by %2$s" : "%2$s 님이 변경함", + "Deleted by %2$s" : "%2$s 님이 삭제함", + "Restored by %2$s" : "%2$s 님이 복원함", "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다", "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다", "Upload (max. %s)" : "업로드(최대 %s)", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index c11318c2890..53ec6c1d804 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -95,6 +95,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s verwijderde %1$s", "You restored %1$s" : "U herstelde %1$s", "%2$s restored %1$s" : "%2$s herstelde %1$s", + "Changed by %2$s" : "Gewijzigd door %2$s", + "Deleted by %2$s" : "Verwijderd door %2$s", + "Restored by %2$s" : "Hersteld door %2$s", "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is", "%s could not be renamed" : "%s kon niet worden hernoemd", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 1a80d1eb3f1..6a077b1cc1a 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -93,6 +93,9 @@ "%2$s deleted %1$s" : "%2$s verwijderde %1$s", "You restored %1$s" : "U herstelde %1$s", "%2$s restored %1$s" : "%2$s herstelde %1$s", + "Changed by %2$s" : "Gewijzigd door %2$s", + "Deleted by %2$s" : "Verwijderd door %2$s", + "Restored by %2$s" : "Hersteld door %2$s", "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is", "%s could not be renamed" : "%s kon niet worden hernoemd", "Upload (max. %s)" : "Upload (max. %s)", diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 61c0f3e2e59..70d38e747ba 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -96,6 +96,9 @@ OC.L10N.register( "%2$s deleted %1$s" : "%2$s eliminou %1$s", "You restored %1$s" : "Você restaurou %1$s", "%2$s restored %1$s" : "%2$s restaurou %1$s", + "Changed by %2$s" : "Modificado por %2$s", + "Deleted by %2$s" : "Deletado por %2$s", + "Restored by %2$s" : "Restaurado por %2$s", "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado", "%s could not be renamed" : "%s não pode ser renomeado", "Upload (max. %s)" : "Envio (max. %s)", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index 395976dbfdf..d0023e7d5be 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -94,6 +94,9 @@ "%2$s deleted %1$s" : "%2$s eliminou %1$s", "You restored %1$s" : "Você restaurou %1$s", "%2$s restored %1$s" : "%2$s restaurou %1$s", + "Changed by %2$s" : "Modificado por %2$s", + "Deleted by %2$s" : "Deletado por %2$s", + "Restored by %2$s" : "Restaurado por %2$s", "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado", "%s could not be renamed" : "%s não pode ser renomeado", "Upload (max. %s)" : "Envio (max. %s)", diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js index a8d1dea1a09..7e2770e6f52 100644 --- a/apps/files_external/l10n/es_MX.js +++ b/apps/files_external/l10n/es_MX.js @@ -5,6 +5,7 @@ OC.L10N.register( "Personal" : "Personal", "Grant access" : "Conceder acceso", "Access granted" : "Acceso concedido", + "None" : "Ninguno", "Username" : "Nombre de usuario", "Password" : "Contraseña", "API key" : "clave API", diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json index 3fdea60b775..9a9835d9598 100644 --- a/apps/files_external/l10n/es_MX.json +++ b/apps/files_external/l10n/es_MX.json @@ -3,6 +3,7 @@ "Personal" : "Personal", "Grant access" : "Conceder acceso", "Access granted" : "Acceso concedido", + "None" : "Ninguno", "Username" : "Nombre de usuario", "Password" : "Contraseña", "API key" : "clave API", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index f27e885772e..3faf53bf1e5 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -12,6 +12,8 @@ OC.L10N.register( "Invalid mount point" : "잘못된 마운트 지점", "Objectstore forbidden" : "Objectstore에 접근 금지됨", "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"", + "Not permitted to use backend \"%s\"" : "백엔드 \"%s\" 사용이 허가되지 않았음", + "Not permitted to use authentication mechanism \"%s\"" : "인증 방식 \"%s\" 사용이 허가되지 않았음", "Unsatisfied backend parameters" : "백엔드 인자가 부족함", "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함", "Personal" : "개인", @@ -41,11 +43,16 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "클라이언트 ID", "Client secret" : "클라이언트 비밀 값", + "OpenStack" : "OpenStack", "Username" : "사용자 이름", "Password" : "암호", + "Tenant name" : "테넌트 이름", + "Identity endpoint URL" : "아이덴티티 끝점(Endpoint) URL", + "Rackspace" : "Rackspace", "API key" : "API 키", "Username and password" : "사용자 이름과 암호", "Session credentials" : "세션 접근 정보", + "RSA public key" : "RSA 공개 키", "Public key" : "공개 키", "Amazon S3" : "Amazon S3", "Bucket" : "버킷", @@ -71,9 +78,12 @@ OC.L10N.register( "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP", "SMB / CIFS" : "SMB/CIFS", "Share" : "공유", + "Domain" : "도메인", "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS", "Username as share" : "사용자 이름으로 공유", "OpenStack Object Storage" : "OpenStack 객체 저장소", + "Service name" : "서비스 이름", + "Request timeout (seconds)" : "요청 시간 제한(초)", "<b>Note:</b> " : "<b>메모:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index ab804d58702..039190cf4f9 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -10,6 +10,8 @@ "Invalid mount point" : "잘못된 마운트 지점", "Objectstore forbidden" : "Objectstore에 접근 금지됨", "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"", + "Not permitted to use backend \"%s\"" : "백엔드 \"%s\" 사용이 허가되지 않았음", + "Not permitted to use authentication mechanism \"%s\"" : "인증 방식 \"%s\" 사용이 허가되지 않았음", "Unsatisfied backend parameters" : "백엔드 인자가 부족함", "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함", "Personal" : "개인", @@ -39,11 +41,16 @@ "OAuth2" : "OAuth2", "Client ID" : "클라이언트 ID", "Client secret" : "클라이언트 비밀 값", + "OpenStack" : "OpenStack", "Username" : "사용자 이름", "Password" : "암호", + "Tenant name" : "테넌트 이름", + "Identity endpoint URL" : "아이덴티티 끝점(Endpoint) URL", + "Rackspace" : "Rackspace", "API key" : "API 키", "Username and password" : "사용자 이름과 암호", "Session credentials" : "세션 접근 정보", + "RSA public key" : "RSA 공개 키", "Public key" : "공개 키", "Amazon S3" : "Amazon S3", "Bucket" : "버킷", @@ -69,9 +76,12 @@ "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP", "SMB / CIFS" : "SMB/CIFS", "Share" : "공유", + "Domain" : "도메인", "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS", "Username as share" : "사용자 이름으로 공유", "OpenStack Object Storage" : "OpenStack 객체 저장소", + "Service name" : "서비스 이름", + "Request timeout (seconds)" : "요청 시간 제한(초)", "<b>Note:</b> " : "<b>메모:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.", diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js index 929d14347fc..b7bc419fdd7 100644 --- a/apps/files_external/l10n/oc.js +++ b/apps/files_external/l10n/oc.js @@ -14,16 +14,23 @@ OC.L10N.register( "Generate keys" : "Generar de claus", "Error generating key pair" : "Error al moment de la generacion de las claus", "Enable encryption" : "Activar lo chiframent", + "Enable previews" : "Activar las previsualizacions", + "Never" : "Pas jamai", "(group)" : "(grop)", "Saved" : "Salvat", + "Access key" : "Clau d'accès", + "Secret key" : "Clau secreta", "None" : "Pas cap", + "OAuth1" : "OAuth1", "App key" : "App key", "App secret" : "App secret", + "OAuth2" : "OAuth2", "Client ID" : "ID Client", "Client secret" : "Secret client", "Username" : "Nom d'utilizaire", "Password" : "Senhal", "API key" : "Clau API", + "RSA public key" : "Clau publica RSA", "Public key" : "Clau publica", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -36,16 +43,23 @@ OC.L10N.register( "URL" : "URL", "Remote subfolder" : "Sosdorsièr distant", "Secure https://" : "Securizacion https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Òste", "Secure ftps://" : "Securizacion ftps://", + "Google Drive" : "Google Drive", "Local" : "Local", "Location" : "Emplaçament", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "SFTP with secret key login" : "SFTP amb un identificant secret", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Partejar", + "Domain" : "Domeni", "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC", "Username as share" : "Nom d'utilizaire coma nom de partiment", "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Nom del servici", "<b>Note:</b> " : "<b>Atencion :</b>", "<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>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.", "<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>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.", @@ -57,6 +71,7 @@ OC.L10N.register( "Scope" : "Portada", "External Storage" : "Emmagazinatge externe", "Folder name" : "Nom del dorsièr", + "Authentication" : "Autentificacion", "Configuration" : "Configuracion", "Available for" : "Disponible per", "Advanced settings" : "Paramètres avançats", diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json index 84fef9ec53f..05670245634 100644 --- a/apps/files_external/l10n/oc.json +++ b/apps/files_external/l10n/oc.json @@ -12,16 +12,23 @@ "Generate keys" : "Generar de claus", "Error generating key pair" : "Error al moment de la generacion de las claus", "Enable encryption" : "Activar lo chiframent", + "Enable previews" : "Activar las previsualizacions", + "Never" : "Pas jamai", "(group)" : "(grop)", "Saved" : "Salvat", + "Access key" : "Clau d'accès", + "Secret key" : "Clau secreta", "None" : "Pas cap", + "OAuth1" : "OAuth1", "App key" : "App key", "App secret" : "App secret", + "OAuth2" : "OAuth2", "Client ID" : "ID Client", "Client secret" : "Secret client", "Username" : "Nom d'utilizaire", "Password" : "Senhal", "API key" : "Clau API", + "RSA public key" : "Clau publica RSA", "Public key" : "Clau publica", "Amazon S3" : "Amazon S3", "Bucket" : "Bucket", @@ -34,16 +41,23 @@ "URL" : "URL", "Remote subfolder" : "Sosdorsièr distant", "Secure https://" : "Securizacion https://", + "Dropbox" : "Dropbox", + "FTP" : "FTP", "Host" : "Òste", "Secure ftps://" : "Securizacion ftps://", + "Google Drive" : "Google Drive", "Local" : "Local", "Location" : "Emplaçament", "ownCloud" : "ownCloud", + "SFTP" : "SFTP", "SFTP with secret key login" : "SFTP amb un identificant secret", + "SMB / CIFS" : "SMB / CIFS", "Share" : "Partejar", + "Domain" : "Domeni", "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC", "Username as share" : "Nom d'utilizaire coma nom de partiment", "OpenStack Object Storage" : "OpenStack Object Storage", + "Service name" : "Nom del servici", "<b>Note:</b> " : "<b>Atencion :</b>", "<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>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.", "<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>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.", @@ -55,6 +69,7 @@ "Scope" : "Portada", "External Storage" : "Emmagazinatge externe", "Folder name" : "Nom del dorsièr", + "Authentication" : "Autentificacion", "Configuration" : "Configuracion", "Available for" : "Disponible per", "Advanced settings" : "Paramètres avançats", diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index 973aa0f15ac..0eb2b032e52 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -38,8 +38,13 @@ OC.L10N.register( "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt", "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s", + "%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s", + "%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt", "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", + "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link", + "Shared with %2$s" : "Geteilt mit %2$s", "Shares" : "Freigaben", "Accept" : "Ok", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index 5526be3b6bf..3c0b3dd5714 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -36,8 +36,13 @@ "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen", "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt", "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt", + "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s", + "%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s", + "%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link", "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt", "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben", + "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link", + "Shared with %2$s" : "Geteilt mit %2$s", "Shares" : "Freigaben", "Accept" : "Ok", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s", diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js index 2e4a32480b1..a87d6156d40 100644 --- a/apps/files_sharing/l10n/fi_FI.js +++ b/apps/files_sharing/l10n/fi_FI.js @@ -43,6 +43,14 @@ OC.L10N.register( "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta", "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", + "Downloaded via public link" : "Lataa julkista linkkiä käyttäen", + "Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa", + "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa", + "Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta", + "Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta", + "Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta", + "Shared by %2$s" : "Jakanut %2$s", + "Shared via public link" : "Jaettu julkisen linkin kautta", "Shares" : "Jaot", "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s", "Accept" : "Hyväksy", diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json index 2b938d95c0e..172b8476092 100644 --- a/apps/files_sharing/l10n/fi_FI.json +++ b/apps/files_sharing/l10n/fi_FI.json @@ -41,6 +41,14 @@ "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta", "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi", "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta", + "Downloaded via public link" : "Lataa julkista linkkiä käyttäen", + "Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa", + "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa", + "Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta", + "Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta", + "Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta", + "Shared by %2$s" : "Jakanut %2$s", + "Shared via public link" : "Jaettu julkisen linkin kautta", "Shares" : "Jaot", "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s", "Accept" : "Hyväksy", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index d6fcab9c788..8cd66b34d24 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -43,6 +43,14 @@ OC.L10N.register( "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento", "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", + "Downloaded via public link" : "Scaricata tramite collegamento pubblico", + "Shared with %2$s" : "Condivisa con %2$s", + "Shared with group %2$s" : "Condivisa con il gruppo %2$s", + "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s", + "Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s", + "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s", + "Shared by %2$s" : "Condivisa da %2$s", + "Shared via public link" : "Condivisa tramite collegamento pubblico", "Shares" : "Condivisioni", "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s", "Accept" : "Accetta", diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 1ae87296032..b93dafd7555 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -41,6 +41,14 @@ "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento", "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te", "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento", + "Downloaded via public link" : "Scaricata tramite collegamento pubblico", + "Shared with %2$s" : "Condivisa con %2$s", + "Shared with group %2$s" : "Condivisa con il gruppo %2$s", + "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s", + "Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s", + "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s", + "Shared by %2$s" : "Condivisa da %2$s", + "Shared via public link" : "Condivisa tramite collegamento pubblico", "Shares" : "Condivisioni", "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s", "Accept" : "Accetta", diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js index e4b86b528f3..19eea24e97c 100644 --- a/apps/files_sharing/l10n/ko.js +++ b/apps/files_sharing/l10n/ko.js @@ -38,9 +38,21 @@ OC.L10N.register( "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함", "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함", + "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함", + "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함", + "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함", "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", + "Downloaded via public link" : "공개 링크로 다운로드", + "Shared with %2$s" : "%2$s 님과 공유함", + "Shared with group %2$s" : "%2$s 그룹과 공유함", + "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함", + "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함", + "Shared via link by %2$s" : "%2$s 님이 링크로 공유함", + "Shared by %2$s" : "%2$s 님이 공유함", + "Shared via public link" : "공개 링크로 공유함", "Shares" : "공유", + "You received %2$s as a remote share from %1$s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다", "Accept" : "수락", "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json index 383e5038f3c..dd7e398c15c 100644 --- a/apps/files_sharing/l10n/ko.json +++ b/apps/files_sharing/l10n/ko.json @@ -36,9 +36,21 @@ "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨", "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함", "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함", + "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함", + "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함", + "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함", "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함", "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함", + "Downloaded via public link" : "공개 링크로 다운로드", + "Shared with %2$s" : "%2$s 님과 공유함", + "Shared with group %2$s" : "%2$s 그룹과 공유함", + "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함", + "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함", + "Shared via link by %2$s" : "%2$s 님이 링크로 공유함", + "Shared by %2$s" : "%2$s 님이 공유함", + "Shared via public link" : "공개 링크로 공유함", "Shares" : "공유", + "You received %2$s as a remote share from %1$s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다", "Accept" : "수락", "Decline" : "거절", "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s", diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js index f1edae5f8eb..7b31b7c73e2 100644 --- a/apps/files_sharing/l10n/nl.js +++ b/apps/files_sharing/l10n/nl.js @@ -43,6 +43,14 @@ OC.L10N.register( "%2$s shared %1$s via link" : "%2$s deelde %1$s via link", "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", + "Downloaded via public link" : "Gedownload via een openbare link", + "Shared with %2$s" : "Gedeeld met %2$s", + "Shared with group %2$s" : "Gedeeld met groep %2$s", + "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s", + "Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s", + "Shared via link by %2$s" : "Gedeeld via link door %2$s", + "Shared by %2$s" : "Gedeeld door %2$s", + "Shared via public link" : "Gedeeld via een openbare link", "Shares" : "Gedeeld", "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s", "Accept" : "Accepteren", diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json index a285071ca30..92ba1c04268 100644 --- a/apps/files_sharing/l10n/nl.json +++ b/apps/files_sharing/l10n/nl.json @@ -41,6 +41,14 @@ "%2$s shared %1$s via link" : "%2$s deelde %1$s via link", "%2$s shared %1$s with you" : "%2$s deelde %1$s met u", "You shared %1$s via link" : "U deelde %1$s via link", + "Downloaded via public link" : "Gedownload via een openbare link", + "Shared with %2$s" : "Gedeeld met %2$s", + "Shared with group %2$s" : "Gedeeld met groep %2$s", + "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s", + "Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s", + "Shared via link by %2$s" : "Gedeeld via link door %2$s", + "Shared by %2$s" : "Gedeeld door %2$s", + "Shared via public link" : "Gedeeld via een openbare link", "Shares" : "Gedeeld", "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s", "Accept" : "Accepteren", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index cb167dfb5a4..d2dac6d5955 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -43,6 +43,14 @@ OC.L10N.register( "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s", "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", + "Downloaded via public link" : "Baixar via link público", + "Shared with %2$s" : "Compartilhado com %2$s", + "Shared with group %2$s" : "Compartilhado com o grupo %2$s", + "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s", + "Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s", + "Shared via link by %2$s" : "Compartilhado via link por %2$s", + "Shared by %2$s" : "Compartilhado por %2$s", + "Shared via public link" : "Compartilhado via link público", "Shares" : "Compartilhamentos", "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s", "Accept" : "Aceitar", diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index b42a56f03ce..e64c07ff8e0 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -41,6 +41,14 @@ "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s", "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você", "You shared %1$s via link" : "Você compartilhou %1$s via link", + "Downloaded via public link" : "Baixar via link público", + "Shared with %2$s" : "Compartilhado com %2$s", + "Shared with group %2$s" : "Compartilhado com o grupo %2$s", + "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s", + "Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s", + "Shared via link by %2$s" : "Compartilhado via link por %2$s", + "Shared by %2$s" : "Compartilhado por %2$s", + "Shared via public link" : "Compartilhado via link público", "Shares" : "Compartilhamentos", "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s", "Accept" : "Aceitar", diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js index c2fc858d153..0fdf25fea6f 100644 --- a/apps/user_ldap/l10n/ka_GE.js +++ b/apps/user_ldap/l10n/ka_GE.js @@ -1,6 +1,7 @@ OC.L10N.register( "user_ldap", { + "Failed to clear the mappings." : "ბმების წაშლის დროს მოხდა შეცდომა", "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას", "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.", diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json index be93dc5a626..7ddaaef5bda 100644 --- a/apps/user_ldap/l10n/ka_GE.json +++ b/apps/user_ldap/l10n/ka_GE.json @@ -1,4 +1,5 @@ { "translations": { + "Failed to clear the mappings." : "ბმების წაშლის დროს მოხდა შეცდომა", "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას", "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.", diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 13ccf805b69..8d96e7de91d 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -661,12 +661,13 @@ class Wizard extends LDAPUtility { //connectAndBind may throw Exception, it needs to be catched by the //callee of this method - // unallowed anonymous bind throws 48. But if it throws 48, we - // detected port and TLS, i.e. it is successful. try { $settingsFound = $this->connectAndBind($p, $t); } catch (\Exception $e) { - if($e->getCode() === 48) { + // any reply other than -1 (= cannot connect) is already okay, + // because then we found the server + // unavailable startTLS returns -11 + if($e->getCode() > 0) { $settingsFound = true; } else { throw $e; @@ -1084,7 +1085,7 @@ class Wizard extends LDAPUtility { } else if ($errNo === 2) { return $this->connectAndBind($port, $tls, true); } - throw new \Exception($error); + throw new \Exception($error, $errNo); } /** |