diff options
252 files changed, 905 insertions, 351 deletions
diff --git a/README.md b/README.md index 6a4d57c9fbc..d131b34f479 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,16 @@ […learn more about how to get support for Nextcloud here!](https://nextcloud.com/support) -## Contribution Guidelines +## Join the team :family: + +### How to contribute + +1. [Set up your local development environment](https://docs.nextcloud.com/server/14/developer_manual/general/devenv.html) :rocket: +2. [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue) :notebook: +3. Create a branch, a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request) and `@mention` the people from the issue :computer: +4. Wait for it to get merged and :tada: + +### Contribution Guidelines All contributions to this repository from June, 16 2016 on are considered to be licensed under the AGPLv3 or any later version. @@ -56,7 +65,7 @@ Please review the [guidelines for contributing](https://github.com/nextcloud/ser More information how to contribute: [https://nextcloud.com/contribute/](https://nextcloud.com/contribute/) -## Running master checkouts +### Running master checkouts Third-party components are handled as git submodules which have to be initialized first. So aside from the regular git checkout invoking `git submodule update --init` or a similar command is needed, for details see Git documentation. diff --git a/apps/accessibility/css/themehighcontrast.scss b/apps/accessibility/css/themehighcontrast.scss index 8149e7669f5..3d371365d56 100644 --- a/apps/accessibility/css/themehighcontrast.scss +++ b/apps/accessibility/css/themehighcontrast.scss @@ -51,8 +51,7 @@ body { font-weight: 400; } -// Opacity trick -* { +[class^='icon-'], [class*=' icon-'], +.action { opacity: 1 !important; } - diff --git a/apps/comments/css/comments.scss b/apps/comments/css/comments.scss index 45463acae81..75daeff875f 100644 --- a/apps/comments/css/comments.scss +++ b/apps/comments/css/comments.scss @@ -198,7 +198,6 @@ padding-left: 40px; word-wrap: break-word; overflow-wrap: break-word; - overflow: hidden; } #commentsTabView .comment .action { diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js index 8f76393a9ea..111f63fc6ec 100644 --- a/apps/comments/l10n/fr.js +++ b/apps/comments/l10n/fr.js @@ -29,6 +29,7 @@ OC.L10N.register( "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.", "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”", "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”", + "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers", "Unknown user" : "Utilisateur·trice inconnu·e", "A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”", "A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”" diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json index 4c4d9eb175a..e2cfeb2c5d5 100644 --- a/apps/comments/l10n/fr.json +++ b/apps/comments/l10n/fr.json @@ -27,6 +27,7 @@ "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "Vous avez été mentionné sur \"{file}\", dans un commentaire par un utilisateur qui a été supprimé depuis lors.", "%1$s mentioned you in a comment on “%2$s”" : "%1$s vous a mentionné⋅e dans un commentaire sur “%2$s”", "{user} mentioned you in a comment on “{file}”" : "{user} vous a mentionné⋅e dans un commentaire sur “{file}”", + "Files app plugin to add comments to files" : "Plugin Fichiers app pour ajouter des commentaires aux fichiers", "Unknown user" : "Utilisateur·trice inconnu·e", "A (now) deleted user mentioned you in a comment on “%s”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “%s”", "A (now) deleted user mentioned you in a comment on “{file}”" : "Un·e utilisateur·trice (maintenant supprimé·e) vous a mentionné·e dans un commentaire sur “{file}”" diff --git a/apps/comments/l10n/zh_TW.js b/apps/comments/l10n/zh_TW.js index f24ee7d4706..106717269f7 100644 --- a/apps/comments/l10n/zh_TW.js +++ b/apps/comments/l10n/zh_TW.js @@ -29,6 +29,7 @@ OC.L10N.register( "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你", "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你", "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你", + "Files app plugin to add comments to files" : "檔案插件程式插件，用於為檔案增加註釋", "Unknown user" : "未知的使用者", "A (now) deleted user mentioned you in a comment on “%s”" : "一個已被刪除的用戶在 “%s” 的留言中提到你", "A (now) deleted user mentioned you in a comment on “{file}”" : "一個已被刪除的用戶在 “{file}” 的留言中提到你" diff --git a/apps/comments/l10n/zh_TW.json b/apps/comments/l10n/zh_TW.json index 46379cdd263..c3187b8b8c8 100644 --- a/apps/comments/l10n/zh_TW.json +++ b/apps/comments/l10n/zh_TW.json @@ -27,6 +27,7 @@ "You were mentioned on “{file}”, in a comment by a user that has since been deleted" : "一個已被刪除的用戶在 “{file}” 的留言中提到你", "%1$s mentioned you in a comment on “%2$s”" : "%1$s 在 “%2$s” 的留言中提到你", "{user} mentioned you in a comment on “{file}”" : "{user} 在 “{file}” 的留言中提到你", + "Files app plugin to add comments to files" : "檔案插件程式插件，用於為檔案增加註釋", "Unknown user" : "未知的使用者", "A (now) deleted user mentioned you in a comment on “%s”" : "一個已被刪除的用戶在 “%s” 的留言中提到你", "A (now) deleted user mentioned you in a comment on “{file}”" : "一個已被刪除的用戶在 “{file}” 的留言中提到你" diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js index 1d84c216de6..5ba33435d9f 100644 --- a/apps/dav/l10n/fr.js +++ b/apps/dav/l10n/fr.js @@ -60,6 +60,7 @@ OC.L10N.register( "More options at %s" : "Plus d'options à %s", "Contacts" : "Contacts", "WebDAV" : "WebDAV", + "WebDAV endpoint" : "Point d'accès WebDAV", "Technical details" : "Détails techniques", "Remote Address: %s" : "Adresse distante : %s", "Request ID: %s" : "ID de la requête : %s", diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json index 68bfc4777e5..3079607e595 100644 --- a/apps/dav/l10n/fr.json +++ b/apps/dav/l10n/fr.json @@ -58,6 +58,7 @@ "More options at %s" : "Plus d'options à %s", "Contacts" : "Contacts", "WebDAV" : "WebDAV", + "WebDAV endpoint" : "Point d'accès WebDAV", "Technical details" : "Détails techniques", "Remote Address: %s" : "Adresse distante : %s", "Request ID: %s" : "ID de la requête : %s", diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index 5b3c18c9720..0157ae038cb 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -352,10 +352,10 @@ class FileSearchBackend implements ISearchBackend { return 0 + $value; case SearchPropertyDefinition::DATATYPE_DATETIME: if (is_numeric($value)) { - return 0 + $value; + return max(0, 0 + $value); } $date = \DateTime::createFromFormat(\DateTime::ATOM, $value); - return ($date instanceof \DateTime) ? $date->getTimestamp() : 0; + return ($date instanceof \DateTime && $date->getTimestamp() !== false) ? $date->getTimestamp() : 0; default: return $value; } diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js index c3c673a8a9e..c4a9c146dfb 100644 --- a/apps/encryption/l10n/fr.js +++ b/apps/encryption/l10n/fr.js @@ -31,6 +31,8 @@ OC.L10N.register( "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ", "Default encryption module" : "Module de chiffrement par défaut", + "Default encryption module for server-side encryption" : "Module de chiffrement par défaut pour le chiffrement côté serveur", + "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés. Une fois le chiffrement côté serveur activé, il n'est pas possible de désactiver le chiffrement et de revenir à un système non chiffré.\n\t\tVeuillez lire la documentation pour connaître toutes les implications avant de vous décider à activer le chiffrement côté serveur.", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe suivant :\n\n%s\n\nVeuillez suivre ces instructions :\n\n1. Connectez-vous à l'interface web et trouvez la section \"Module de chiffrement de base d'\" dans vos paramètres personnels;\n\n2. Entrez le mot de passe fourni ci-dessus dans le champ \"Ancien mot de passe de connexion\";\n\n3. Entrez le mot de passe que vous utilisez actuellement pour vous connecter dans le champ \"Actuel mot de passe de connexion\";\n\n4. Validez en cliquant sur le bouton \"Mettre à jour le mot de passe de votre clef privée\".\n", "The share will expire on %s." : "Le partage expirera le %s.", "Cheers!" : "À bientôt !", diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json index 9f0d72e39e9..a73cb2f39bf 100644 --- a/apps/encryption/l10n/fr.json +++ b/apps/encryption/l10n/fr.json @@ -29,6 +29,8 @@ "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ", "Default encryption module" : "Module de chiffrement par défaut", + "Default encryption module for server-side encryption" : "Module de chiffrement par défaut pour le chiffrement côté serveur", + "In order to use this encryption module you need to enable server-side\n\t\tencryption in the admin settings. Once enabled this module will encrypt\n\t\tall your files transparently. The encryption is based on AES 256 keys.\n\t\tThe module won't touch existing files, only new files will be encrypted\n\t\tafter server-side encryption was enabled. It is also not possible to\n\t\tdisable the encryption again and switch back to a unencrypted system.\n\t\tPlease read the documentation to know all implications before you decide\n\t\tto enable server-side encryption." : "Pour utiliser ce module de chiffrement, vous devez activer le chiffrement côté serveur dans les paramètres d'administration. Une fois activé, ce module chiffrera tous vos fichiers de manière transparente. Le chiffrement est basé sur des clés AES 256 bits.\nLe module ne touchera pas les fichiers existants, seuls les nouveaux fichiers seront chiffrés. Une fois le chiffrement côté serveur activé, il n'est pas possible de désactiver le chiffrement et de revenir à un système non chiffré.\n\t\tVeuillez lire la documentation pour connaître toutes les implications avant de vous décider à activer le chiffrement côté serveur.", "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe suivant :\n\n%s\n\nVeuillez suivre ces instructions :\n\n1. Connectez-vous à l'interface web et trouvez la section \"Module de chiffrement de base d'\" dans vos paramètres personnels;\n\n2. Entrez le mot de passe fourni ci-dessus dans le champ \"Ancien mot de passe de connexion\";\n\n3. Entrez le mot de passe que vous utilisez actuellement pour vous connecter dans le champ \"Actuel mot de passe de connexion\";\n\n4. Validez en cliquant sur le bouton \"Mettre à jour le mot de passe de votre clef privée\".\n", "The share will expire on %s." : "Le partage expirera le %s.", "Cheers!" : "À bientôt !", diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index 8f0b39030ba..1cd2744c3bb 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -34,6 +34,7 @@ OC.L10N.register( "Share with me through my #Nextcloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant de Cloud Fédéré #Nextcloud", "Sharing" : "Partage", "Federated file sharing" : "Partage de fichiers fédéré", + "Provide federated file sharing across servers" : "Fourni un partage de fichiers fédéré entre plusieurs serveurs", "Federated Cloud Sharing" : "Partage Cloud Fédéré", "Open documentation" : "Voir la documentation", "Adjust how people can share between servers." : "Réglez comment les personnes peuvent partager entre les serveurs.", diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index cf5fe7c5500..2008db86101 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -32,6 +32,7 @@ "Share with me through my #Nextcloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant de Cloud Fédéré #Nextcloud", "Sharing" : "Partage", "Federated file sharing" : "Partage de fichiers fédéré", + "Provide federated file sharing across servers" : "Fourni un partage de fichiers fédéré entre plusieurs serveurs", "Federated Cloud Sharing" : "Partage Cloud Fédéré", "Open documentation" : "Voir la documentation", "Adjust how people can share between servers." : "Réglez comment les personnes peuvent partager entre les serveurs.", diff --git a/apps/federation/l10n/fr.js b/apps/federation/l10n/fr.js index 4f1c484e56a..5d97f4545af 100644 --- a/apps/federation/l10n/fr.js +++ b/apps/federation/l10n/fr.js @@ -6,6 +6,7 @@ OC.L10N.register( "No server to federate with found" : "Aucun serveur avec lequel fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", + "Federation allows you to connect with other trusted servers to exchange the user directory." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", "Trusted servers" : "Serveurs de confiance", "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès", diff --git a/apps/federation/l10n/fr.json b/apps/federation/l10n/fr.json index 7957227e572..5f93d760f14 100644 --- a/apps/federation/l10n/fr.json +++ b/apps/federation/l10n/fr.json @@ -4,6 +4,7 @@ "No server to federate with found" : "Aucun serveur avec lequel fédérer n'a été trouvé", "Could not add server" : "Impossible d'ajouter le serveur", "Federation" : "Fédération", + "Federation allows you to connect with other trusted servers to exchange the user directory." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs.", "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Une fédération vous permet de vous connecter avec d'autres serveurs de confiance pour échanger la liste des utilisateurs. Par exemple, ce sera utilisé pour auto-compléter les utilisateurs externes lors du partage fédéré.", "Trusted servers" : "Serveurs de confiance", "Add server automatically once a federated share was created successfully" : "Ajouter un serveur automatiquement une fois que le partage a été créé avec succès", diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 47120ede7a0..c41255b9868 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -612,12 +612,15 @@ table tr.summary td { table.dragshadow { width:auto; - z-index: 100; + z-index: 2000; } table.dragshadow td.filename { padding-left:60px; padding-right:16px; height: 36px; + + /* Override "max-width: 0" to prevent file name and size from overlapping */ + max-width: unset; } table.dragshadow td.size { padding-right:8px; diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 2812bc73c53..142af6c68ce 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -127,6 +127,7 @@ OC.L10N.register( "A file or folder has been <strong>restored</strong>" : "Un fichier ou un répertoire a été <strong>restauré</strong>", "Unlimited" : "Illimité", "Upload (max. %s)" : "Envoi (max. %s)", + "File Management" : "Gestion de fichier", "File handling" : "Gestion de fichiers", "Maximum upload size" : "Taille max. d'envoi", "max. possible: " : "Max. possible :", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 1bbc81834f1..9e064dd3fee 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -125,6 +125,7 @@ "A file or folder has been <strong>restored</strong>" : "Un fichier ou un répertoire a été <strong>restauré</strong>", "Unlimited" : "Illimité", "Upload (max. %s)" : "Envoi (max. %s)", + "File Management" : "Gestion de fichier", "File handling" : "Gestion de fichiers", "Maximum upload size" : "Taille max. d'envoi", "max. possible: " : "Max. possible :", diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js index d0ce5411041..2c512f8de97 100644 --- a/apps/files/l10n/nb.js +++ b/apps/files/l10n/nb.js @@ -52,7 +52,7 @@ OC.L10N.register( "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede", "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede", "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".", - "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "Name" : "Navn", "Size" : "Størrelse", "Modified" : "Endret", @@ -68,7 +68,7 @@ OC.L10N.register( "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", "\"/\" is not allowed inside a file name." : "\"/\" tillates ikke i et filnavn.", - "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)", diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json index 7100d99d9ca..b209be25df2 100644 --- a/apps/files/l10n/nb.json +++ b/apps/files/l10n/nb.json @@ -50,7 +50,7 @@ "Could not create file \"{file}\" because it already exists" : "Klarte ikke å opprette fil \"{file}\" fordi den finnes allerede", "Could not create folder \"{dir}\" because it already exists" : "Klarete ikke å opprette mappe \"{dir}\" fordi den finnes allerede", "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".", - "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "Name" : "Navn", "Size" : "Størrelse", "Modified" : "Endret", @@ -66,7 +66,7 @@ "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.", "File name cannot be empty." : "Filnavn kan ikke være tomt.", "\"/\" is not allowed inside a file name." : "\"/\" tillates ikke i et filnavn.", - "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", + "\"{name}\" is not an allowed filetype" : "\"{name}\" er ikke en tillatt filtype", "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!", "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!", "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)", diff --git a/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php b/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php index fcdf7e3e879..8dce76cb774 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php +++ b/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php @@ -35,13 +35,17 @@ class TimeZoneProvider { public function get() { if (!$this->timeZone) { $net = $this->system->getNetPath(); - if ($net) { + // for local domain names we can assume same timezone + if ($net && strpos($this->host, '.') !== false) { $command = sprintf('%s time zone -S %s', $net, escapeshellarg($this->host) ); $this->timeZone = exec($command); - } else { // fallback to server timezone + } + + if ($this->timeZone) { + // fallback to server timezone $this->timeZone = date_default_timezone_get(); } } diff --git a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php index ca88af219a8..4ef0be583d5 100644 --- a/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php +++ b/apps/files_external/3rdparty/icewind/smb/src/Wrapped/Share.php @@ -13,6 +13,7 @@ use Icewind\SMB\Exception\DependencyException; use Icewind\SMB\Exception\FileInUseException; use Icewind\SMB\Exception\InvalidTypeException; use Icewind\SMB\Exception\NotFoundException; +use Icewind\SMB\IFileInfo; use Icewind\SMB\INotifyHandler; use Icewind\SMB\IServer; use Icewind\SMB\System; @@ -153,6 +154,18 @@ class Share extends AbstractShare { * @return \Icewind\SMB\IFileInfo */ public function stat($path) { + // some windows server setups don't seem to like the allinfo command + // use the dir command instead to get the file info where possible + if ($path !== "" && $path !== "/") { + $parent = dirname($path); + $dir = $this->dir($parent); + $file = array_values(array_filter($dir, function(IFileInfo $info) use ($path) { + return $info->getPath() === $path; + })); + if ($file) { + return $file[0]; + } + } $escapedPath = $this->escapePath($path); $output = $this->execute('allinfo ' . $escapedPath); // Windows and non Windows Fileserver may respond different diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index 9226c495333..cb139e0b3f6 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -105,6 +105,8 @@ OC.L10N.register( "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Le support du FTP dans PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Merci de demander à votre administrateur de l'installer.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" n'est pas installé. Le montage de %s n'est pas possible. Merci de demander à l'administrateur système de l'installer.", "External storage support" : "Support de stockage externe", + "Adds basic external storage support" : "Ajoute la prise en charge de base du stockage externe", + "This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.\n\nExternal storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation." : "Cette application permet aux administrateurs de configurer des connexions à des stockage externes, tels que des serveurs FTP, des magasins d'objets S3 ou SWIFT, d'autres serveurs Nextcloud, des serveurs WebDAV, etc. Les administrateurs peuvent choisir les types de stockage à activer et peuvent monter ces emplacements de stockage pour un utilisateur, un groupe ou l'ensemble du système. Les utilisateurs verront apparaître un nouveau dossier dans leur répertoire racine Nextcloud, auquel ils pourront accéder et utiliser comme n'importe quel autre dossier Nextcloud. Le stockage externe permet également aux utilisateurs de partager des fichiers stockés dans ces emplacements externes. Dans ce cas, les informations d'identification du propriétaire du fichier sont utilisées lorsque le destinataire demande le fichier à partir du stockage externe, garantissant ainsi que le destinataire peut accéder au fichier partagé.\n\nLe stockage externe peut être configuré à l'aide de l'interface graphique ou via l'interface en ligne de commande. Cette deuxième option offre àaux utilisateurs avancés une plus grande flexibilité pour configurer les montages de stockage externes en masse et définir les priorités de montage. D'autres informations sont disponibles dans la documentation de l'interface graphique de stockage externe et la documentation du fichier de configuration de stockage externe.", "No external storage configured or you don't have the permission to configure them" : "Aucun stockage externe configuré ou vous n'avez pas l'autorisation de les configurer", "Name" : "Nom", "Storage type" : "Type de stockage", @@ -136,6 +138,7 @@ OC.L10N.register( "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", "Google Drive" : "Google Drive", + "This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.\n\nExternal storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation." : "Cette application permet aux administrateurs de configurer des connexions à des fournisseurs de stockage externes, tels que des serveurs FTP, des magasins d'objets S3 ou SWIFT, Google Drive, Dropbox, d'autres serveurs Nextcloud, des serveurs WebDAV, etc. Les administrateurs peuvent choisir les types de stockage à activer et peuvent monter ces emplacements de stockage pour un utilisateur, un groupe ou l'ensemble du système. Les utilisateurs verront apparaître un nouveau dossier dans leur répertoire racine Nextcloud, auquel ils pourront accéder et utiliser comme n'importe quel autre dossier Nextcloud. Le stockage externe permet également aux utilisateurs de partager des fichiers stockés dans ces emplacements externes. Dans ce cas, les informations d'identification du propriétaire du fichier sont utilisées lorsque le destinataire demande le fichier à partir du stockage externe, garantissant ainsi que le destinataire peut accéder au fichier partagé.\n\nLe stockage externe peut être configuré à l'aide de l'interface graphique ou via l'interface en ligne de commande. Cette deuxième option offre aux utilisateurs avancés une plus grande flexibilité pour configurer les montages de stockage externes en masse et définir les priorités de montage. D'autres informations sont disponibles dans la documentation de l'interface graphique de stockage externe et la documentation du fichier de configuration de stockage externe.", "No external storage configured" : "Aucun stockage externe configuré", "You can add external storages in the personal settings" : "Vous pouvez ajouter des stockages externes via vos paramètres personnels", "Delete" : "Supprimer", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index 66ca54c3791..f2988f03fd0 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -103,6 +103,8 @@ "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "Le support du FTP dans PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Merci de demander à votre administrateur de l'installer.", "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" n'est pas installé. Le montage de %s n'est pas possible. Merci de demander à l'administrateur système de l'installer.", "External storage support" : "Support de stockage externe", + "Adds basic external storage support" : "Ajoute la prise en charge de base du stockage externe", + "This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.\n\nExternal storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation." : "Cette application permet aux administrateurs de configurer des connexions à des stockage externes, tels que des serveurs FTP, des magasins d'objets S3 ou SWIFT, d'autres serveurs Nextcloud, des serveurs WebDAV, etc. Les administrateurs peuvent choisir les types de stockage à activer et peuvent monter ces emplacements de stockage pour un utilisateur, un groupe ou l'ensemble du système. Les utilisateurs verront apparaître un nouveau dossier dans leur répertoire racine Nextcloud, auquel ils pourront accéder et utiliser comme n'importe quel autre dossier Nextcloud. Le stockage externe permet également aux utilisateurs de partager des fichiers stockés dans ces emplacements externes. Dans ce cas, les informations d'identification du propriétaire du fichier sont utilisées lorsque le destinataire demande le fichier à partir du stockage externe, garantissant ainsi que le destinataire peut accéder au fichier partagé.\n\nLe stockage externe peut être configuré à l'aide de l'interface graphique ou via l'interface en ligne de commande. Cette deuxième option offre àaux utilisateurs avancés une plus grande flexibilité pour configurer les montages de stockage externes en masse et définir les priorités de montage. D'autres informations sont disponibles dans la documentation de l'interface graphique de stockage externe et la documentation du fichier de configuration de stockage externe.", "No external storage configured or you don't have the permission to configure them" : "Aucun stockage externe configuré ou vous n'avez pas l'autorisation de les configurer", "Name" : "Nom", "Storage type" : "Type de stockage", @@ -134,6 +136,7 @@ "OpenStack" : "OpenStack", "Dropbox" : "Dropbox", "Google Drive" : "Google Drive", + "This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other Nextcloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root Nextcloud directory, which they can access and use like any other Nextcloud folder. External storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.\n\nExternal storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation." : "Cette application permet aux administrateurs de configurer des connexions à des fournisseurs de stockage externes, tels que des serveurs FTP, des magasins d'objets S3 ou SWIFT, Google Drive, Dropbox, d'autres serveurs Nextcloud, des serveurs WebDAV, etc. Les administrateurs peuvent choisir les types de stockage à activer et peuvent monter ces emplacements de stockage pour un utilisateur, un groupe ou l'ensemble du système. Les utilisateurs verront apparaître un nouveau dossier dans leur répertoire racine Nextcloud, auquel ils pourront accéder et utiliser comme n'importe quel autre dossier Nextcloud. Le stockage externe permet également aux utilisateurs de partager des fichiers stockés dans ces emplacements externes. Dans ce cas, les informations d'identification du propriétaire du fichier sont utilisées lorsque le destinataire demande le fichier à partir du stockage externe, garantissant ainsi que le destinataire peut accéder au fichier partagé.\n\nLe stockage externe peut être configuré à l'aide de l'interface graphique ou via l'interface en ligne de commande. Cette deuxième option offre aux utilisateurs avancés une plus grande flexibilité pour configurer les montages de stockage externes en masse et définir les priorités de montage. D'autres informations sont disponibles dans la documentation de l'interface graphique de stockage externe et la documentation du fichier de configuration de stockage externe.", "No external storage configured" : "Aucun stockage externe configuré", "You can add external storages in the personal settings" : "Vous pouvez ajouter des stockages externes via vos paramètres personnels", "Delete" : "Supprimer", diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 3d6fc62ceba..708fe1f2182 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -160,17 +160,30 @@ thead { } #header .header-shared-by { - display: inline-block; color: var(--color-primary-text); position: relative; - top: -10px; font-weight: 300; font-size: 11px; opacity: .57; - margin-top: 10px; } -#note { - text-align: center; - padding: 10px; -} +#note-content { + padding: 5px; + display:inline-block; + width: 350px; + .content { + overflow: auto; + max-height: 200px; + } +} + +// hide the primary on public share on mobile +@media only screen and (max-width: 768px) { + #body-public { + .header-right { + #header-primary-action { + display: none; + } + } + } +}
\ No newline at end of file diff --git a/apps/files_sharing/js/public_note.js b/apps/files_sharing/js/public_note.js new file mode 100644 index 00000000000..a303d6c7675 --- /dev/null +++ b/apps/files_sharing/js/public_note.js @@ -0,0 +1,31 @@ +/** + * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com) + * + * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + $(document).ready(function() { + var noteElmt = document.getElementById('notemenu') + if (noteElmt) { + var noteHtml = noteElmt.outerHTML + $(noteHtml).insertBefore('#header-primary-action'); + $('#notemenu').removeClass('hidden'); + OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu')) + } + })
\ No newline at end of file diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js index d2debbbb3cf..c987270d1ab 100644 --- a/apps/files_sharing/l10n/de.js +++ b/apps/files_sharing/l10n/de.js @@ -117,7 +117,7 @@ OC.L10N.register( "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", "For more info, please ask the person who sent this link." : "Um nähere Informationen zu erhalten, wende dich bitte an die Person, die dir diesen Link geschickt hat.", - "Note:" : "Bemerkung:", + "Share note" : "Notiz teilen", "Download %s" : "Download %s", "Upload files to %s" : "Dateien für %s hochladen", "Select or drop files" : "Dateien auswählen oder hierher ziehen", diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json index ca8d470c950..500f6f947a1 100644 --- a/apps/files_sharing/l10n/de.json +++ b/apps/files_sharing/l10n/de.json @@ -115,7 +115,7 @@ "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", "For more info, please ask the person who sent this link." : "Um nähere Informationen zu erhalten, wende dich bitte an die Person, die dir diesen Link geschickt hat.", - "Note:" : "Bemerkung:", + "Share note" : "Notiz teilen", "Download %s" : "Download %s", "Upload files to %s" : "Dateien für %s hochladen", "Select or drop files" : "Dateien auswählen oder hierher ziehen", diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index c39e290eb42..41569984c9b 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -117,7 +117,7 @@ OC.L10N.register( "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", "For more info, please ask the person who sent this link." : "Um nähere Informationen zu erhalten, wenden Sie sich bitte an die Person, die Ihnen diesen Link geschickt hat.", - "Note:" : "Bemerkung:", + "Share note" : "Notiz teilen", "Download %s" : "Download %s", "Upload files to %s" : "Dateien für %s hochladen", "Select or drop files" : "Dateien auswählen oder hierher ziehen", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index 26ffaab92f6..61b83178028 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -115,7 +115,7 @@ "the link expired" : "Der Link ist abgelaufen", "sharing is disabled" : "Teilen ist deaktiviert", "For more info, please ask the person who sent this link." : "Um nähere Informationen zu erhalten, wenden Sie sich bitte an die Person, die Ihnen diesen Link geschickt hat.", - "Note:" : "Bemerkung:", + "Share note" : "Notiz teilen", "Download %s" : "Download %s", "Upload files to %s" : "Dateien für %s hochladen", "Select or drop files" : "Dateien auswählen oder hierher ziehen", diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js index f409029db2f..ffe268fce23 100644 --- a/apps/files_sharing/l10n/es.js +++ b/apps/files_sharing/l10n/es.js @@ -116,7 +116,6 @@ OC.L10N.register( "the link expired" : "el enlace caducó", "sharing is disabled" : "compartir está desactivado", "For more info, please ask the person who sent this link." : "Para más información, pregunte a la persona que le envió el enlace.", - "Note:" : "Nota:", "Download %s" : "Descargar %s", "Upload files to %s" : "Subir archivos a %s", "Select or drop files" : "Seleccione o arrastre y suelte archivos", diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json index cc90f6a2437..cc675a5675e 100644 --- a/apps/files_sharing/l10n/es.json +++ b/apps/files_sharing/l10n/es.json @@ -114,7 +114,6 @@ "the link expired" : "el enlace caducó", "sharing is disabled" : "compartir está desactivado", "For more info, please ask the person who sent this link." : "Para más información, pregunte a la persona que le envió el enlace.", - "Note:" : "Nota:", "Download %s" : "Descargar %s", "Upload files to %s" : "Subir archivos a %s", "Select or drop files" : "Seleccione o arrastre y suelte archivos", diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js index 1ae57da363a..03d6145495e 100644 --- a/apps/files_sharing/l10n/fr.js +++ b/apps/files_sharing/l10n/fr.js @@ -93,6 +93,7 @@ OC.L10N.register( "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Partager %s en envoyant le mot de passe par Nextcloud Talk a échoué car Nextcloud Talk n'est pas activé.", "You cannot share to a Circle if the app is not enabled" : "Vous ne pouvez pas partager au Cercle si l'application n'est pas activée", "Please specify a valid circle" : "Veuillez entrer un cercle valide", + "Sharing %s failed because the back end does not support room shares" : "Le partage %s a échoué parce que l'arrière-plan ne prend pas en charge les partages.", "Unknown share type" : "Type de partage inconnu", "Not a directory" : "N'est pas un répertoire", "Could not lock path" : "Impossible de verrouiller le chemin", @@ -105,6 +106,7 @@ OC.L10N.register( "Add to your Nextcloud" : "Ajouter à votre Nextcloud", "Share API is disabled" : "l'API de partage est désactivée", "File sharing" : "Partage de fichier", + "This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "Cette application permet aux utilisateurs de partager des fichiers dans Nextcloud. Si cette option est activée, l'administrateur peut choisir quels groupes peuvent partager des fichiers. Les utilisateurs concernés peuvent ensuite partager des fichiers et des dossiers avec d'autres utilisateurs et groupes au sein de Nextcloud. De plus, si l'administrateur active la fonction de lien de partage, un lien externe peut être utilisé pour partager des fichiers avec d'autres utilisateurs en dehors de Nextcloud. Les administrateurs peuvent également faire respecter les mots de passe, les dates d'expiration et permettre le partage de serveur à serveur via des liens de partage, aussi bien que le partage à partir d'appareils mobiles.\nDésactiver cette fonction supprime les fichiers et dossiers partagés sur le serveur pour tous les destinataires de partage, ainsi que sur les clients de synchronisation et les applications mobiles. Plus d'informations sont disponibles dans la documentation Nextcloud.", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", @@ -115,7 +117,7 @@ OC.L10N.register( "the link expired" : "le lien a expiré", "sharing is disabled" : "le partage est désactivé", "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", - "Note:" : "Note :", + "Share note" : "Partager la note", "Download %s" : "Télécharger %s", "Upload files to %s" : "Téléversement des fichiers vers %s", "Select or drop files" : "Sélectionner ou glisser-déposer vos fichiers", diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json index 0c9123ace6c..fc9e83b8b2c 100644 --- a/apps/files_sharing/l10n/fr.json +++ b/apps/files_sharing/l10n/fr.json @@ -91,6 +91,7 @@ "Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled" : "Partager %s en envoyant le mot de passe par Nextcloud Talk a échoué car Nextcloud Talk n'est pas activé.", "You cannot share to a Circle if the app is not enabled" : "Vous ne pouvez pas partager au Cercle si l'application n'est pas activée", "Please specify a valid circle" : "Veuillez entrer un cercle valide", + "Sharing %s failed because the back end does not support room shares" : "Le partage %s a échoué parce que l'arrière-plan ne prend pas en charge les partages.", "Unknown share type" : "Type de partage inconnu", "Not a directory" : "N'est pas un répertoire", "Could not lock path" : "Impossible de verrouiller le chemin", @@ -103,6 +104,7 @@ "Add to your Nextcloud" : "Ajouter à votre Nextcloud", "Share API is disabled" : "l'API de partage est désactivée", "File sharing" : "Partage de fichier", + "This application enables users to share files within Nextcloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within Nextcloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of Nextcloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.\nTurning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation." : "Cette application permet aux utilisateurs de partager des fichiers dans Nextcloud. Si cette option est activée, l'administrateur peut choisir quels groupes peuvent partager des fichiers. Les utilisateurs concernés peuvent ensuite partager des fichiers et des dossiers avec d'autres utilisateurs et groupes au sein de Nextcloud. De plus, si l'administrateur active la fonction de lien de partage, un lien externe peut être utilisé pour partager des fichiers avec d'autres utilisateurs en dehors de Nextcloud. Les administrateurs peuvent également faire respecter les mots de passe, les dates d'expiration et permettre le partage de serveur à serveur via des liens de partage, aussi bien que le partage à partir d'appareils mobiles.\nDésactiver cette fonction supprime les fichiers et dossiers partagés sur le serveur pour tous les destinataires de partage, ainsi que sur les clients de synchronisation et les applications mobiles. Plus d'informations sont disponibles dans la documentation Nextcloud.", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", "Name" : "Nom", "Share time" : "Date de partage", @@ -113,7 +115,7 @@ "the link expired" : "le lien a expiré", "sharing is disabled" : "le partage est désactivé", "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.", - "Note:" : "Note :", + "Share note" : "Partager la note", "Download %s" : "Télécharger %s", "Upload files to %s" : "Téléversement des fichiers vers %s", "Select or drop files" : "Sélectionner ou glisser-déposer vos fichiers", diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js index f0d9f4cbc32..5f6f27dddf0 100644 --- a/apps/files_sharing/l10n/he.js +++ b/apps/files_sharing/l10n/he.js @@ -93,7 +93,6 @@ OC.L10N.register( "the link expired" : "הקישור פג תוקף", "sharing is disabled" : "השיתוף נוטרל", "For more info, please ask the person who sent this link." : "למידע נוסף, יש לפנות לשולח קישור זה.", - "Note:" : "הערה:", "Download %s" : "הורדה %s", "Upload files to %s" : "העלאת קבצים על %s", "Select or drop files" : "בחירה או השלכה של קבצים", diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json index c2aa245c09d..faf908313b5 100644 --- a/apps/files_sharing/l10n/he.json +++ b/apps/files_sharing/l10n/he.json @@ -91,7 +91,6 @@ "the link expired" : "הקישור פג תוקף", "sharing is disabled" : "השיתוף נוטרל", "For more info, please ask the person who sent this link." : "למידע נוסף, יש לפנות לשולח קישור זה.", - "Note:" : "הערה:", "Download %s" : "הורדה %s", "Upload files to %s" : "העלאת קבצים על %s", "Select or drop files" : "בחירה או השלכה של קבצים", diff --git a/apps/files_sharing/l10n/hu.js b/apps/files_sharing/l10n/hu.js index b54a455b013..fefd349fcc8 100644 --- a/apps/files_sharing/l10n/hu.js +++ b/apps/files_sharing/l10n/hu.js @@ -4,13 +4,23 @@ OC.L10N.register( "Shared with others" : "Megosztva másokkal", "Shared with you" : "Megosztva veled", "Shared by link" : "Megosztva hivatkozással", + "Deleted shares" : "Törölt megosztások", + "Shares" : "Megosztások", "Nothing shared with you yet" : "Nincs még semmi megosztva veled", "Files and folders others share with you will show up here" : "Mások által megosztott fájlok és mappák itt jelennek meg", "Nothing shared yet" : "Nincs semmi megosztva", "Files and folders you share will show up here" : "Az Ön által megosztott fájlok és mappák itt jelennek meg", "No shared links" : "Nincs megosztott hivatkozás", "Files and folders you share by link will show up here" : "A hivatkozással megosztott fájlok és mappák itt jelennek meg", + "No deleted shares" : "Nincs törölt megosztás", + "Shares you deleted will show up here" : "A törölt megosztások itt jelennek meg", + "No shares" : "Nincs megosztás", + "Shares will show up here" : "A megosztások itt jelennek meg", + "Restore share" : "Megosztás visszaállítása", + "Something happened. Unable to restore the share." : "Hiba történt. Nem lehet visszaállítani a megosztást.", + "Move or copy" : "Mozgatás vagy másolás", "Download" : "Letöltés", + "Delete" : "Törlés", "You can upload into this folder" : "Ebbe a mappába fel tud tölteni", "No compatible server found at {remote}" : "Itt nem található kompatibilis szerver: {remote}", "Invalid server URL" : "Érvénytelen szerver URL", @@ -61,6 +71,7 @@ OC.L10N.register( "{actor} shared {file} with {user}" : "{actor} megosztotta ezt: {file} vele: {user}", "{actor} removed {user} from {file}" : "{actor} eltávolította ezt: {user} innen: {file}", "{actor} shared {file} with you" : "{actor} megosztotta veled ezt: {file}", + "{actor} removed you from the share named {file}" : "{actor} eltávolított a {file} nevű megosztásból", "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Egy e-mailben vagy nyilvános hivatkozással megosztott fájl vagy mappa <strong>letöltve</strong>", "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy mappa meg lett osztva egy <strong>másik szerverről</strong>", "A file or folder has been <strong>shared</strong>" : "Egy fájl vagy mappa <strong>megosztva</strong>", @@ -102,6 +113,7 @@ OC.L10N.register( "the link expired" : "lejárt a hivatkozás érvényességi ideje", "sharing is disabled" : "letiltásra került a megosztás", "For more info, please ask the person who sent this link." : "További információért fordulj ahhoz, aki ezt a linket küldte neked!", + "Share note" : "Jegyzet megosztása", "Download %s" : "%s letöltése", "Upload files to %s" : "Fájlok felöltése ide: %s", "Select or drop files" : "Válassz ki vagy dobj ide fájlokat", diff --git a/apps/files_sharing/l10n/hu.json b/apps/files_sharing/l10n/hu.json index 42fc56a8e51..a2fee686eb4 100644 --- a/apps/files_sharing/l10n/hu.json +++ b/apps/files_sharing/l10n/hu.json @@ -2,13 +2,23 @@ "Shared with others" : "Megosztva másokkal", "Shared with you" : "Megosztva veled", "Shared by link" : "Megosztva hivatkozással", + "Deleted shares" : "Törölt megosztások", + "Shares" : "Megosztások", "Nothing shared with you yet" : "Nincs még semmi megosztva veled", "Files and folders others share with you will show up here" : "Mások által megosztott fájlok és mappák itt jelennek meg", "Nothing shared yet" : "Nincs semmi megosztva", "Files and folders you share will show up here" : "Az Ön által megosztott fájlok és mappák itt jelennek meg", "No shared links" : "Nincs megosztott hivatkozás", "Files and folders you share by link will show up here" : "A hivatkozással megosztott fájlok és mappák itt jelennek meg", + "No deleted shares" : "Nincs törölt megosztás", + "Shares you deleted will show up here" : "A törölt megosztások itt jelennek meg", + "No shares" : "Nincs megosztás", + "Shares will show up here" : "A megosztások itt jelennek meg", + "Restore share" : "Megosztás visszaállítása", + "Something happened. Unable to restore the share." : "Hiba történt. Nem lehet visszaállítani a megosztást.", + "Move or copy" : "Mozgatás vagy másolás", "Download" : "Letöltés", + "Delete" : "Törlés", "You can upload into this folder" : "Ebbe a mappába fel tud tölteni", "No compatible server found at {remote}" : "Itt nem található kompatibilis szerver: {remote}", "Invalid server URL" : "Érvénytelen szerver URL", @@ -59,6 +69,7 @@ "{actor} shared {file} with {user}" : "{actor} megosztotta ezt: {file} vele: {user}", "{actor} removed {user} from {file}" : "{actor} eltávolította ezt: {user} innen: {file}", "{actor} shared {file} with you" : "{actor} megosztotta veled ezt: {file}", + "{actor} removed you from the share named {file}" : "{actor} eltávolított a {file} nevű megosztásból", "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Egy e-mailben vagy nyilvános hivatkozással megosztott fájl vagy mappa <strong>letöltve</strong>", "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy mappa meg lett osztva egy <strong>másik szerverről</strong>", "A file or folder has been <strong>shared</strong>" : "Egy fájl vagy mappa <strong>megosztva</strong>", @@ -100,6 +111,7 @@ "the link expired" : "lejárt a hivatkozás érvényességi ideje", "sharing is disabled" : "letiltásra került a megosztás", "For more info, please ask the person who sent this link." : "További információért fordulj ahhoz, aki ezt a linket küldte neked!", + "Share note" : "Jegyzet megosztása", "Download %s" : "%s letöltése", "Upload files to %s" : "Fájlok felöltése ide: %s", "Select or drop files" : "Válassz ki vagy dobj ide fájlokat", diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js index 1bba3ab4340..4ab9d988d26 100644 --- a/apps/files_sharing/l10n/is.js +++ b/apps/files_sharing/l10n/is.js @@ -111,7 +111,6 @@ OC.L10N.register( "the link expired" : "tengillinn er útrunninn", "sharing is disabled" : "slökkt er á skráadeilingu", "For more info, please ask the person who sent this link." : "Til að vita meira skaltu hafa samband við þann sem sendi þér þennan tengil.", - "Note:" : "Athugaðu:", "Download %s" : "Sækja %s", "Upload files to %s" : "Senda inn skrár á %s", "Select or drop files" : "Veldu eða slepptu skrám", diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json index 404e8606403..d9c5fae8a43 100644 --- a/apps/files_sharing/l10n/is.json +++ b/apps/files_sharing/l10n/is.json @@ -109,7 +109,6 @@ "the link expired" : "tengillinn er útrunninn", "sharing is disabled" : "slökkt er á skráadeilingu", "For more info, please ask the person who sent this link." : "Til að vita meira skaltu hafa samband við þann sem sendi þér þennan tengil.", - "Note:" : "Athugaðu:", "Download %s" : "Sækja %s", "Upload files to %s" : "Senda inn skrár á %s", "Select or drop files" : "Veldu eða slepptu skrám", diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js index 2db5f629a1f..0226906c9e0 100644 --- a/apps/files_sharing/l10n/it.js +++ b/apps/files_sharing/l10n/it.js @@ -117,7 +117,7 @@ OC.L10N.register( "the link expired" : "il collegamento è scaduto", "sharing is disabled" : "la condivisione è disabilitata", "For more info, please ask the person who sent this link." : "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.", - "Note:" : "Nota:", + "Share note" : "Condividi nota", "Download %s" : "Scarica %s", "Upload files to %s" : "Carica file su %s", "Select or drop files" : "Seleziona o deseleziona file", diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json index 1f24765f17f..5196de56b9e 100644 --- a/apps/files_sharing/l10n/it.json +++ b/apps/files_sharing/l10n/it.json @@ -115,7 +115,7 @@ "the link expired" : "il collegamento è scaduto", "sharing is disabled" : "la condivisione è disabilitata", "For more info, please ask the person who sent this link." : "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.", - "Note:" : "Nota:", + "Share note" : "Condividi nota", "Download %s" : "Scarica %s", "Upload files to %s" : "Carica file su %s", "Select or drop files" : "Seleziona o deseleziona file", diff --git a/apps/files_sharing/l10n/nb.js b/apps/files_sharing/l10n/nb.js index d8e750b8ecf..89b0681006c 100644 --- a/apps/files_sharing/l10n/nb.js +++ b/apps/files_sharing/l10n/nb.js @@ -59,7 +59,7 @@ OC.L10N.register( "{actor} removed share" : "{actor} fjernet deling", "You shared {file} with {user}" : "Du delte {file} med {user}", "You removed {user} from {file}" : "Du fjernet {user} fra {file}", - "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", + "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}", "{actor} shared {file} with you" : "{actor} delte {file} med deg", "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Ei fil eller mappe delt via e-post eller offentlig lenke ble <strong>lastet ned</strong>", diff --git a/apps/files_sharing/l10n/nb.json b/apps/files_sharing/l10n/nb.json index 16917d9839a..908708ef595 100644 --- a/apps/files_sharing/l10n/nb.json +++ b/apps/files_sharing/l10n/nb.json @@ -57,7 +57,7 @@ "{actor} removed share" : "{actor} fjernet deling", "You shared {file} with {user}" : "Du delte {file} med {user}", "You removed {user} from {file}" : "Du fjernet {user} fra {file}", - "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", + "{actor} shared {file} with {user}" : "{actor} delete {file} med {user}", "{actor} removed {user} from {file}" : "{actor} fjernet {user} fra {file}", "{actor} shared {file} with you" : "{actor} delte {file} med deg", "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "Ei fil eller mappe delt via e-post eller offentlig lenke ble <strong>lastet ned</strong>", diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js index d92acf12c9c..d0c56dab316 100644 --- a/apps/files_sharing/l10n/pt_BR.js +++ b/apps/files_sharing/l10n/pt_BR.js @@ -117,7 +117,7 @@ OC.L10N.register( "the link expired" : "o link expirou", "sharing is disabled" : "o compartilhamento está desativado", "For more info, please ask the person who sent this link." : "Para mais informações, pergunte à pessoa que lhe enviou o link.", - "Note:" : "Anotação:", + "Share note" : "Anotação de compartilhamento", "Download %s" : "Baixar %s", "Upload files to %s" : "Enviar arquivos para %s", "Select or drop files" : "Selecione ou solte arquivos", diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json index 90c3c40d237..12990116427 100644 --- a/apps/files_sharing/l10n/pt_BR.json +++ b/apps/files_sharing/l10n/pt_BR.json @@ -115,7 +115,7 @@ "the link expired" : "o link expirou", "sharing is disabled" : "o compartilhamento está desativado", "For more info, please ask the person who sent this link." : "Para mais informações, pergunte à pessoa que lhe enviou o link.", - "Note:" : "Anotação:", + "Share note" : "Anotação de compartilhamento", "Download %s" : "Baixar %s", "Upload files to %s" : "Enviar arquivos para %s", "Select or drop files" : "Selecione ou solte arquivos", diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js index c9bfe0e2f82..ca529bf51ed 100644 --- a/apps/files_sharing/l10n/ru.js +++ b/apps/files_sharing/l10n/ru.js @@ -116,7 +116,6 @@ OC.L10N.register( "the link expired" : "истёк срок действия ссылки", "sharing is disabled" : "закрыт общий доступ", "For more info, please ask the person who sent this link." : "Для получения дополнительной информации, свяжитесь с тем, кто отправил вам эту ссылку.", - "Note:" : "Примечание:", "Download %s" : "Скачать %s", "Upload files to %s" : "Загрузка файлов пользователю %s", "Select or drop files" : "Выберите или перетащите файлы", diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json index 4950fbf5f97..44b60f022be 100644 --- a/apps/files_sharing/l10n/ru.json +++ b/apps/files_sharing/l10n/ru.json @@ -114,7 +114,6 @@ "the link expired" : "истёк срок действия ссылки", "sharing is disabled" : "закрыт общий доступ", "For more info, please ask the person who sent this link." : "Для получения дополнительной информации, свяжитесь с тем, кто отправил вам эту ссылку.", - "Note:" : "Примечание:", "Download %s" : "Скачать %s", "Upload files to %s" : "Загрузка файлов пользователю %s", "Select or drop files" : "Выберите или перетащите файлы", diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js index 30a235ed7c8..126e8cdba3a 100644 --- a/apps/files_sharing/l10n/sk.js +++ b/apps/files_sharing/l10n/sk.js @@ -116,7 +116,6 @@ OC.L10N.register( "the link expired" : "linke vypršala platnosť", "sharing is disabled" : "sprístupňovanie je zakázané", "For more info, please ask the person who sent this link." : "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.", - "Note:" : "Poznámka:", "Download %s" : "Stiahnuť %s", "Upload files to %s" : "Nahrať súbory do %s", "Select or drop files" : "Vyberte alebo položte súbory", diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json index 9b7929ebbef..7b1191d5904 100644 --- a/apps/files_sharing/l10n/sk.json +++ b/apps/files_sharing/l10n/sk.json @@ -114,7 +114,6 @@ "the link expired" : "linke vypršala platnosť", "sharing is disabled" : "sprístupňovanie je zakázané", "For more info, please ask the person who sent this link." : "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.", - "Note:" : "Poznámka:", "Download %s" : "Stiahnuť %s", "Upload files to %s" : "Nahrať súbory do %s", "Select or drop files" : "Vyberte alebo položte súbory", diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js index 69dfdadd6c0..bf3d23f1c9a 100644 --- a/apps/files_sharing/l10n/sr.js +++ b/apps/files_sharing/l10n/sr.js @@ -116,7 +116,6 @@ OC.L10N.register( "the link expired" : "веза је истекла", "sharing is disabled" : "дељење је искључено", "For more info, please ask the person who sent this link." : "За више информација, питајте особу која вам је послала везу.", - "Note:" : "Белешка:", "Download %s" : "Преузми %s", "Upload files to %s" : "Отпремите фајлове на%s", "Select or drop files" : "Одаберите или превуците фајлове", diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json index fe7308639de..d2f321d4bf7 100644 --- a/apps/files_sharing/l10n/sr.json +++ b/apps/files_sharing/l10n/sr.json @@ -114,7 +114,6 @@ "the link expired" : "веза је истекла", "sharing is disabled" : "дељење је искључено", "For more info, please ask the person who sent this link." : "За више информација, питајте особу која вам је послала везу.", - "Note:" : "Белешка:", "Download %s" : "Преузми %s", "Upload files to %s" : "Отпремите фајлове на%s", "Select or drop files" : "Одаберите или превуците фајлове", diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index efe325ec75c..638ad504c26 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -117,7 +117,7 @@ OC.L10N.register( "the link expired" : "bağlantı süresi dolmuş", "sharing is disabled" : "paylaşım devre dışı bırakılmış", "For more info, please ask the person who sent this link." : "Ayrıntılı bilgi almak için bu bağlantıyı aldığınız kişi ile görüşün.", - "Note:" : "Not:", + "Share note" : "Notu paylaş", "Download %s" : "%s İndir", "Upload files to %s" : "Dosyaları %s konumuna yükle", "Select or drop files" : "Dosyaları seçin ya da sürükleyip bırakın", diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 4d658977584..9e32cfd11ab 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -115,7 +115,7 @@ "the link expired" : "bağlantı süresi dolmuş", "sharing is disabled" : "paylaşım devre dışı bırakılmış", "For more info, please ask the person who sent this link." : "Ayrıntılı bilgi almak için bu bağlantıyı aldığınız kişi ile görüşün.", - "Note:" : "Not:", + "Share note" : "Notu paylaş", "Download %s" : "%s İndir", "Upload files to %s" : "Dosyaları %s konumuna yükle", "Select or drop files" : "Dosyaları seçin ya da sürükleyip bırakın", diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 9594d6e71f5..6b30747c79f 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -386,6 +386,7 @@ class ShareController extends AuthPublicShareController { \OCP\Util::addScript('files', 'file-upload'); \OCP\Util::addStyle('files_sharing', 'publicView'); \OCP\Util::addScript('files_sharing', 'public'); + \OCP\Util::addScript('files_sharing', 'public_note'); \OCP\Util::addScript('files', 'fileactions'); \OCP\Util::addScript('files', 'fileactionsmenu'); \OCP\Util::addScript('files', 'jquery.fileupload'); diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index ee95661d4c6..c39547bdea5 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -70,6 +70,7 @@ class ShareesAPIController extends OCSController { 'remote_groups' => [], 'emails' => [], 'circles' => [], + 'rooms' => [], ], 'users' => [], 'groups' => [], @@ -78,6 +79,7 @@ class ShareesAPIController extends OCSController { 'emails' => [], 'lookup' => [], 'circles' => [], + 'rooms' => [], ]; protected $reachedEndFor = []; @@ -162,6 +164,10 @@ class ShareesAPIController extends OCSController { if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) { $shareTypes[] = Share::SHARE_TYPE_EMAIL; } + + if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) { + $shareTypes[] = Share::SHARE_TYPE_ROOM; + } } else { $shareTypes[] = Share::SHARE_TYPE_GROUP; $shareTypes[] = Share::SHARE_TYPE_EMAIL; diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index cb02a2b5f23..47a787350d5 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -27,6 +27,8 @@ namespace OCA\Files_Sharing; +use OC\Cache\CappedMemoryCache; +use OC\Files\View; use OCP\Files\Config\IMountProvider; use OCP\Files\Storage\IStorageFactory; use OCP\IConfig; @@ -84,20 +86,35 @@ class MountProvider implements IMountProvider { $superShares = $this->buildSuperShares($shares, $user); $mounts = []; + $view = new View('/' . $user->getUID() . '/files'); + $ownerViews = []; + $sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID()); + $foldersExistCache = new CappedMemoryCache(); foreach ($superShares as $share) { try { - $mounts[] = new SharedMount( + /** @var \OCP\Share\IShare $parentShare */ + $parentShare = $share[0]; + $owner = $parentShare->getShareOwner(); + if (!isset($ownerViews[$owner])) { + $ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files'); + } + $mount = new SharedMount( '\OCA\Files_Sharing\SharedStorage', $mounts, [ 'user' => $user->getUID(), // parent share - 'superShare' => $share[0], + 'superShare' => $parentShare, // children/component of the superShare 'groupedShares' => $share[1], + 'ownerView' => $ownerViews[$owner], + 'sharingDisabledForUser' => $sharingDisabledForUser ], - $storageFactory + $storageFactory, + $view, + $foldersExistCache ); + $mounts[$mount->getMountPoint()] = $mount; } catch (\Exception $e) { $this->logger->logException($e); $this->logger->error('Error while trying to create shared mount'); @@ -105,7 +122,7 @@ class MountProvider implements IMountProvider { } // array_filter removes the null values from the array - return array_filter($mounts); + return array_values(array_filter($mounts)); } /** diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php index 1f5b7eaa13e..a44fa336875 100644 --- a/apps/files_sharing/lib/SharedMount.php +++ b/apps/files_sharing/lib/SharedMount.php @@ -28,10 +28,12 @@ namespace OCA\Files_Sharing; +use OC\Cache\CappedMemoryCache; use OC\Files\Filesystem; use OC\Files\Mount\MountPoint; use OC\Files\Mount\MoveableMount; use OC\Files\View; +use OCP\Files\Storage\IStorageFactory; /** * Shared mount points can be moved by the user @@ -61,19 +63,19 @@ class SharedMount extends MountPoint implements MoveableMount { /** * @param string $storage * @param SharedMount[] $mountpoints - * @param array|null $arguments - * @param \OCP\Files\Storage\IStorageFactory $loader + * @param array $arguments + * @param IStorageFactory $loader + * @param View $recipientView */ - public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) { + public function __construct($storage, array $mountpoints, $arguments, IStorageFactory $loader, View $recipientView, CappedMemoryCache $folderExistCache) { $this->user = $arguments['user']; - $this->recipientView = new View('/' . $this->user . '/files'); + $this->recipientView = $recipientView; $this->superShare = $arguments['superShare']; $this->groupedShares = $arguments['groupedShares']; - $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints); + $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints, $folderExistCache); $absMountPoint = '/' . $this->user . '/files' . $newMountPoint; - $arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files'); parent::__construct($storage, $absMountPoint, $arguments, $loader); } @@ -84,12 +86,18 @@ class SharedMount extends MountPoint implements MoveableMount { * @param SharedMount[] $mountpoints * @return string */ - private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints) { + private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints, CappedMemoryCache $folderExistCache) { $mountPoint = basename($share->getTarget()); $parent = dirname($share->getTarget()); - if (!$this->recipientView->is_dir($parent)) { + if ($folderExistCache->hasKey($parent)) { + $parentExists = $folderExistCache->get($parent); + } else { + $parentExists = $this->recipientView->is_dir($parent); + $folderExistCache->set($parent, $parentExists); + } + if (!$parentExists) { $parent = Helper::getShareFolder($this->recipientView); } @@ -135,19 +143,11 @@ class SharedMount extends MountPoint implements MoveableMount { $name = $pathinfo['filename']; $dir = $pathinfo['dirname']; - // Helper function to find existing mount points - $mountpointExists = function ($path) use ($mountpoints) { - foreach ($mountpoints as $mountpoint) { - if ($mountpoint->getShare()->getTarget() === $path) { - return true; - } - } - return false; - }; - $i = 2; - while ($view->file_exists($path) || $mountpointExists($path)) { + $absolutePath = $this->recipientView->getAbsolutePath($path) . '/'; + while ($view->file_exists($path) || isset($mountpoints[$absolutePath])) { $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext); + $absolutePath = $this->recipientView->getAbsolutePath($path) . '/'; $i++; } diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index f681854cd2b..2d2f14fc554 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -79,6 +79,9 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto private $options; + /** @var boolean */ + private $sharingDisabledForUser; + public function __construct($arguments) { $this->ownerView = $arguments['ownerView']; $this->logger = \OC::$server->getLogger(); @@ -87,6 +90,11 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto $this->groupedShares = $arguments['groupedShares']; $this->user = $arguments['user']; + if (isset($arguments['sharingDisabledForUser'])) { + $this->sharingDisabledForUser = $arguments['sharingDisabledForUser']; + } else { + $this->sharingDisabledForUser = false; + } parent::__construct([ 'storage' => null, @@ -193,7 +201,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto $permissions |= \OCP\Constants::PERMISSION_DELETE; } - if (\OCP\Util::isSharingDisabledForUser()) { + if ($this->sharingDisabledForUser) { $permissions &= ~\OCP\Constants::PERMISSION_SHARE; } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 1c552b7d476..da80f8d1377 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -30,8 +30,15 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); <?php endif; ?> <input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif"> <?php if (isset($_['note']) && $_['note'] !== '') : ?> - <div id="note"> - <?php p($l->t('Note:')); p(' ' . $_['note']); ?> + <div id="notemenu" class="hidden"> + <div class="icon-comment-white menutoggle" tabindex="0" role="button" aria-haspopup="true" aria-controls="note-content" aria-expanded="false"> + <span class="hidden-visually"><?php p($l->t('Share note'))?></span> + </div> + <div id="note-content" class="menu" aria-label="Note content"> + <div class="content"> + <?php p($_['note']); ?> + </div> + </div> </div> <?php endif; ?> diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php index d8c706da03c..adfb72f550a 100644 --- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php @@ -280,8 +280,13 @@ class ShareesAPIControllerTest extends TestCase { $this->shareManager->expects($this->any()) ->method('shareProviderExists') - ->with(\OCP\Share::SHARE_TYPE_EMAIL) - ->willReturn($emailSharingEnabled); + ->will($this->returnCallback(function($shareType) use ($emailSharingEnabled) { + if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) { + return $emailSharingEnabled; + } else { + return false; + } + })); $this->assertInstanceOf(Http\DataResponse::class, $sharees->search($search, $itemType, $page, $perPage, $shareType)); diff --git a/apps/files_trashbin/l10n/fr.js b/apps/files_trashbin/l10n/fr.js index 9c197dd1981..682a5385282 100644 --- a/apps/files_trashbin/l10n/fr.js +++ b/apps/files_trashbin/l10n/fr.js @@ -11,6 +11,8 @@ OC.L10N.register( "This operation is forbidden" : "Cette opération est interdite", "This directory is unavailable, please check the logs or contact the administrator" : "Ce répertoire n'est pas disponible. Consultez les logs ou contactez votre administrateur", "restored" : "restauré", + "This application enables users to restore files that were deleted from the system." : "Cette application permet aux utilisateurs de restaurer des fichiers qui ont été supprimés du système.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Cette application permet aux utilisateurs de restaurer les fichiers qui ont été supprimés du système. Il affiche une liste de fichiers supprimés dans l'interface Web et dispose d'options pour restaurer ces fichiers supprimés dans les répertoires de fichiers des utilisateurs ou les supprimer définitivement du système. La restauration d'un fichier restaure également les versions de fichiers associées, si l'application de versions est activée. Lorsqu'un fichier est supprimé d'un partage, il peut être restauré de la même manière, bien qu'il ne soit plus partagé. Par défaut, ces fichiers restent dans la corbeille pendant 30 jours.\n\nPour empêcher un utilisateur de manquer d'espace disque, l'application Fichiers supprimés n'utilisera pas plus de 50% du quota gratuit actuellement disponible pour les fichiers supprimés. Si les fichiers supprimés dépassent cette limite, l'application supprime les fichiers les plus anciens jusqu'à ce qu'elle soit inférieure à cette limite. Plus d'informations sont disponibles dans la documentation Fichiers supprimés.", "No deleted files" : "Aucun fichier supprimé", "You will be able to recover deleted files from here" : "Ici, vous verrez et pourrez restaurer vos fichiers supprimés", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files_trashbin/l10n/fr.json b/apps/files_trashbin/l10n/fr.json index 347702d6128..295be467465 100644 --- a/apps/files_trashbin/l10n/fr.json +++ b/apps/files_trashbin/l10n/fr.json @@ -9,6 +9,8 @@ "This operation is forbidden" : "Cette opération est interdite", "This directory is unavailable, please check the logs or contact the administrator" : "Ce répertoire n'est pas disponible. Consultez les logs ou contactez votre administrateur", "restored" : "restauré", + "This application enables users to restore files that were deleted from the system." : "Cette application permet aux utilisateurs de restaurer des fichiers qui ont été supprimés du système.", + "This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to the users file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.\nTo prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation." : "Cette application permet aux utilisateurs de restaurer les fichiers qui ont été supprimés du système. Il affiche une liste de fichiers supprimés dans l'interface Web et dispose d'options pour restaurer ces fichiers supprimés dans les répertoires de fichiers des utilisateurs ou les supprimer définitivement du système. La restauration d'un fichier restaure également les versions de fichiers associées, si l'application de versions est activée. Lorsqu'un fichier est supprimé d'un partage, il peut être restauré de la même manière, bien qu'il ne soit plus partagé. Par défaut, ces fichiers restent dans la corbeille pendant 30 jours.\n\nPour empêcher un utilisateur de manquer d'espace disque, l'application Fichiers supprimés n'utilisera pas plus de 50% du quota gratuit actuellement disponible pour les fichiers supprimés. Si les fichiers supprimés dépassent cette limite, l'application supprime les fichiers les plus anciens jusqu'à ce qu'elle soit inférieure à cette limite. Plus d'informations sont disponibles dans la documentation Fichiers supprimés.", "No deleted files" : "Aucun fichier supprimé", "You will be able to recover deleted files from here" : "Ici, vous verrez et pourrez restaurer vos fichiers supprimés", "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier", diff --git a/apps/files_versions/l10n/fr.js b/apps/files_versions/l10n/fr.js index 10855800b32..c49a952e595 100644 --- a/apps/files_versions/l10n/fr.js +++ b/apps/files_versions/l10n/fr.js @@ -7,6 +7,9 @@ OC.L10N.register( "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Restore" : "Restaurer", "No earlier versions available" : "Aucune version antérieure disponible", - "More versions …" : "Plus de versions ..." + "More versions …" : "Plus de versions ...", + "This application automatically maintains older versions of files that are changed." : "Cette application conserve automatiquement des anciennes versions de fichiers qui ont été modifiés.", + "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Cette application maintient automatiquement les anciennes versions des fichiers qui sont modifiés. Lorsqu'elle est activée, un dossier de versions cachées est provisionné dans le répertoire de chaque utilisateur et est utilisé pour stocker les anciennes versions de fichiers. Un utilisateur peut à tout moment revenir à une ancienne version via l'interface Web, le fichier remplacé devenant une version. L'application gère automatiquement le dossier des versions pour s'assurer que l'utilisateur ne manque pas de place à cause des versions stockées.\nEn plus de l'expiration des versions, l'application veille à ne jamais utiliser plus de 50% de l'espace libre actuellement disponible pour l'utilisateur. Si les versions stockées dépassent cette limite, l'application supprime les versions les plus anciennes en premier jusqu'à ce qu'elle atteigne cette limite. Plus d'informations sont disponibles dans la documentation Versions.", + "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\nIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Cette application maintient automatiquement les anciennes versions des fichiers qui sont modifiés. Lorsqu'il est activé, un dossier de versions cachées est provisionné dans le répertoire de chaque utilisateur et est utilisé pour stocker les anciennes versions de fichiers. Un utilisateur peut à tout moment revenir à une ancienne version via l'interface Web, le fichier remplacé devenant une version. L'application gère automatiquement le dossier des versions pour s'assurer que l'utilisateur ne dépasse pas son quota en raison des versions stockées.\nEn plus de l'expiration des versions, l'application des versions veille à ne jamais utiliser plus de 50% de l'espace libre actuellement disponible pour l'utilisateur. Si les versions stockées dépassent cette limite, l'application supprime les versions les plus anciennes en premier jusqu'à ce qu'elle atteigne cette limite. Plus d'informations sont disponibles dans la documentation Versions." }, "nplurals=2; plural=(n > 1);"); diff --git a/apps/files_versions/l10n/fr.json b/apps/files_versions/l10n/fr.json index 5a7cfadc55b..67e99c3f310 100644 --- a/apps/files_versions/l10n/fr.json +++ b/apps/files_versions/l10n/fr.json @@ -5,6 +5,9 @@ "_%n byte_::_%n bytes_" : ["%n octet","%n octets"], "Restore" : "Restaurer", "No earlier versions available" : "Aucune version antérieure disponible", - "More versions …" : "Plus de versions ..." + "More versions …" : "Plus de versions ...", + "This application automatically maintains older versions of files that are changed." : "Cette application conserve automatiquement des anciennes versions de fichiers qui ont été modifiés.", + "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Cette application maintient automatiquement les anciennes versions des fichiers qui sont modifiés. Lorsqu'elle est activée, un dossier de versions cachées est provisionné dans le répertoire de chaque utilisateur et est utilisé pour stocker les anciennes versions de fichiers. Un utilisateur peut à tout moment revenir à une ancienne version via l'interface Web, le fichier remplacé devenant une version. L'application gère automatiquement le dossier des versions pour s'assurer que l'utilisateur ne manque pas de place à cause des versions stockées.\nEn plus de l'expiration des versions, l'application veille à ne jamais utiliser plus de 50% de l'espace libre actuellement disponible pour l'utilisateur. Si les versions stockées dépassent cette limite, l'application supprime les versions les plus anciennes en premier jusqu'à ce qu'elle atteigne cette limite. Plus d'informations sont disponibles dans la documentation Versions.", + "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\nIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Cette application maintient automatiquement les anciennes versions des fichiers qui sont modifiés. Lorsqu'il est activé, un dossier de versions cachées est provisionné dans le répertoire de chaque utilisateur et est utilisé pour stocker les anciennes versions de fichiers. Un utilisateur peut à tout moment revenir à une ancienne version via l'interface Web, le fichier remplacé devenant une version. L'application gère automatiquement le dossier des versions pour s'assurer que l'utilisateur ne dépasse pas son quota en raison des versions stockées.\nEn plus de l'expiration des versions, l'application des versions veille à ne jamais utiliser plus de 50% de l'espace libre actuellement disponible pour l'utilisateur. Si les versions stockées dépassent cette limite, l'application supprime les versions les plus anciennes en premier jusqu'à ce qu'elle atteigne cette limite. Plus d'informations sont disponibles dans la documentation Versions." },"pluralForm" :"nplurals=2; plural=(n > 1);" }
\ No newline at end of file diff --git a/apps/oauth2/l10n/fr.js b/apps/oauth2/l10n/fr.js index 6abd9410438..49447311b49 100644 --- a/apps/oauth2/l10n/fr.js +++ b/apps/oauth2/l10n/fr.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "Votre adresse de redirection doit être une URL complète, par exemple: https://example.com/chemin", "OAuth 2.0" : "OAuth 2.0", + "Allows OAuth2 compatible authentication from other web applications." : "Autoriser l'authentification compatible OAuth2 depuis d'autres applications web.", + "The OAuth2 app allows administrators to configure the built-in authentication workflow to also allow OAuth2 compatible authentication from other web applications." : "L'application OAuth2 permet aux administrateurs de configurer l'authentification intégrée afin d'autoriser l'authentification compatible OAuth2 depuis d'autres applications web.", "OAuth 2.0 clients" : "Clients OAuth 2.0", "Name" : "Nom", "Client Identifier" : "Identifiant du client", diff --git a/apps/oauth2/l10n/fr.json b/apps/oauth2/l10n/fr.json index e59a3eef9e9..92610a63409 100644 --- a/apps/oauth2/l10n/fr.json +++ b/apps/oauth2/l10n/fr.json @@ -1,6 +1,8 @@ { "translations": { "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "Votre adresse de redirection doit être une URL complète, par exemple: https://example.com/chemin", "OAuth 2.0" : "OAuth 2.0", + "Allows OAuth2 compatible authentication from other web applications." : "Autoriser l'authentification compatible OAuth2 depuis d'autres applications web.", + "The OAuth2 app allows administrators to configure the built-in authentication workflow to also allow OAuth2 compatible authentication from other web applications." : "L'application OAuth2 permet aux administrateurs de configurer l'authentification intégrée afin d'autoriser l'authentification compatible OAuth2 depuis d'autres applications web.", "OAuth 2.0 clients" : "Clients OAuth 2.0", "Name" : "Nom", "Client Identifier" : "Identifiant du client", diff --git a/apps/oauth2/l10n/nb.js b/apps/oauth2/l10n/nb.js index ea1d7a57de8..8a7040fecd6 100644 --- a/apps/oauth2/l10n/nb.js +++ b/apps/oauth2/l10n/nb.js @@ -1,6 +1,7 @@ OC.L10N.register( "oauth2", { + "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "URL for videresending må være en fullstendig URL. For eksempel https://yourdomain.com/path", "OAuth 2.0" : "OAuth 2.0", "OAuth 2.0 clients" : "OAuth 2.0-klienter", "Name" : "Navn", diff --git a/apps/oauth2/l10n/nb.json b/apps/oauth2/l10n/nb.json index 0aec1d3727c..0fa1155655d 100644 --- a/apps/oauth2/l10n/nb.json +++ b/apps/oauth2/l10n/nb.json @@ -1,4 +1,5 @@ { "translations": { + "Your redirect URL needs to be a full URL for example: https://yourdomain.com/path" : "URL for videresending må være en fullstendig URL. For eksempel https://yourdomain.com/path", "OAuth 2.0" : "OAuth 2.0", "OAuth 2.0 clients" : "OAuth 2.0-klienter", "Name" : "Navn", diff --git a/apps/oauth2/l10n/zh_TW.js b/apps/oauth2/l10n/zh_TW.js index 5a80e622c5f..3bca0af6114 100644 --- a/apps/oauth2/l10n/zh_TW.js +++ b/apps/oauth2/l10n/zh_TW.js @@ -8,7 +8,7 @@ OC.L10N.register( "Add client" : "新增客戶端", "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 允許其他裝置存取 %s", "Redirection URI" : "重導向 URI", - "Secret" : "秘密口令 (Secret)", + "Secret" : "密鑰Secret", "Add" : "新增" }, "nplurals=1; plural=0;"); diff --git a/apps/oauth2/l10n/zh_TW.json b/apps/oauth2/l10n/zh_TW.json index 1ea169d4349..4dbe095a78b 100644 --- a/apps/oauth2/l10n/zh_TW.json +++ b/apps/oauth2/l10n/zh_TW.json @@ -6,7 +6,7 @@ "Add client" : "新增客戶端", "OAuth 2.0 allows external services to request access to %s." : "OAuth 2.0 允許其他裝置存取 %s", "Redirection URI" : "重導向 URI", - "Secret" : "秘密口令 (Secret)", + "Secret" : "密鑰Secret", "Add" : "新增" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/sharebymail/l10n/fr.js b/apps/sharebymail/l10n/fr.js index 0af58aea7c0..5ea9175698a 100644 --- a/apps/sharebymail/l10n/fr.js +++ b/apps/sharebymail/l10n/fr.js @@ -39,6 +39,7 @@ OC.L10N.register( "You can choose a different password at any time in the share dialog." : "Vous pouvez choisir un mot de passe différent à n'importe quel moment dans la boîte de dialogue de partage.", "Could not find share" : "Impossible de trouver le partage", "Share by mail" : "Partage par e-mail", + "Share provider which allows you to share files by mail" : "Fournisseur de partage qui vous permet de partager des fichiers par courrier électronique.", "Allows users to share a personalized link to a file or folder by putting in an email address." : "Autoriser les utilisateurs de partager un lien personnalisé vers un fichier ou un dossier en renseignant une adresse e-mail.", "Send password by mail" : "Envoyer le mot de passe par e-mail", "Enforce password protection" : "Imposer la protection par mot de passe", diff --git a/apps/sharebymail/l10n/fr.json b/apps/sharebymail/l10n/fr.json index 06610e6982d..acdf15adc44 100644 --- a/apps/sharebymail/l10n/fr.json +++ b/apps/sharebymail/l10n/fr.json @@ -37,6 +37,7 @@ "You can choose a different password at any time in the share dialog." : "Vous pouvez choisir un mot de passe différent à n'importe quel moment dans la boîte de dialogue de partage.", "Could not find share" : "Impossible de trouver le partage", "Share by mail" : "Partage par e-mail", + "Share provider which allows you to share files by mail" : "Fournisseur de partage qui vous permet de partager des fichiers par courrier électronique.", "Allows users to share a personalized link to a file or folder by putting in an email address." : "Autoriser les utilisateurs de partager un lien personnalisé vers un fichier ou un dossier en renseignant une adresse e-mail.", "Send password by mail" : "Envoyer le mot de passe par e-mail", "Enforce password protection" : "Imposer la protection par mot de passe", diff --git a/apps/systemtags/l10n/fr.js b/apps/systemtags/l10n/fr.js index 44224b56a2c..266e72b2e6f 100644 --- a/apps/systemtags/l10n/fr.js +++ b/apps/systemtags/l10n/fr.js @@ -42,6 +42,8 @@ OC.L10N.register( "%s (invisible)" : "%s (invisible)", "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes collaboratives</strong> pour un fichier ont été modifiées", "Collaborative tags" : "Étiquettes collaboratives ", + "Collaborative tagging functionality which shares tags among users." : "Fonctionnalité de tag collaboratif qui partage les tags entre les utilisateurs.", + "Collaborative tagging functionality which shares tags among users. Great for teams.\n\t(If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)" : "Fonctionnalité de tag collaboratif qui partage les tags entre les utilisateurs. Génial pour les équipes.\n\t(Si vous êtes un fournisseur avec plusieurs installations, il est conseillé de désactiver cette application car sinon les tags seront partagés)", "Collaborative tags are available for all users. Restricted tags are visible to users but cannot be assigned by them. Invisible tags are for internal use, since users cannot see or assign them." : "Les tags collaboratifs sont disponibles pour tous les utilisateurs. Les tags restreints sont visibles par les utilisateurs mais ne peuvent pas être attribués par eux. Les balises invisibles sont à usage interne, car les utilisateurs ne peuvent pas les voir ou les assigner.", "Select tag …" : "Sélectionner une étiquette…", "Create a new tag" : "Créer une nouvelle étiquette", diff --git a/apps/systemtags/l10n/fr.json b/apps/systemtags/l10n/fr.json index 20b2161986e..0d4816234fe 100644 --- a/apps/systemtags/l10n/fr.json +++ b/apps/systemtags/l10n/fr.json @@ -40,6 +40,8 @@ "%s (invisible)" : "%s (invisible)", "<strong>System tags</strong> for a file have been modified" : "<strong>Les étiquettes collaboratives</strong> pour un fichier ont été modifiées", "Collaborative tags" : "Étiquettes collaboratives ", + "Collaborative tagging functionality which shares tags among users." : "Fonctionnalité de tag collaboratif qui partage les tags entre les utilisateurs.", + "Collaborative tagging functionality which shares tags among users. Great for teams.\n\t(If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)" : "Fonctionnalité de tag collaboratif qui partage les tags entre les utilisateurs. Génial pour les équipes.\n\t(Si vous êtes un fournisseur avec plusieurs installations, il est conseillé de désactiver cette application car sinon les tags seront partagés)", "Collaborative tags are available for all users. Restricted tags are visible to users but cannot be assigned by them. Invisible tags are for internal use, since users cannot see or assign them." : "Les tags collaboratifs sont disponibles pour tous les utilisateurs. Les tags restreints sont visibles par les utilisateurs mais ne peuvent pas être attribués par eux. Les balises invisibles sont à usage interne, car les utilisateurs ne peuvent pas les voir ou les assigner.", "Select tag …" : "Sélectionner une étiquette…", "Create a new tag" : "Créer une nouvelle étiquette", diff --git a/apps/systemtags/l10n/nb.js b/apps/systemtags/l10n/nb.js index 239257c9229..4dff566ebf6 100644 --- a/apps/systemtags/l10n/nb.js +++ b/apps/systemtags/l10n/nb.js @@ -31,7 +31,7 @@ OC.L10N.register( "%1$s updated system tag %3$s to %2$s" : "%1$s oppdaterte system-merkelapp %3$s til %2$s", "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} oppdaterte system-merkelapp {oldsystemtag} til {newsystemtag}", "You added system tag %2$s to %1$s" : "Du la til system-merkelapp %2$s til %1$s", - "You added system tag {systemtag} to {file}" : "Du la til system-merkelapp {systemtag} til {file}", + "You added system tag {systemtag} to {file}" : "Du la til system merkelapp {systemtag} til {file}", "%1$s added system tag %3$s to %2$s" : "%1$s la til system-merkelapp %3$s til %2$s", "{actor} added system tag {systemtag} to {file}" : "{actor} la til system-merkelapp {systemtag} til {file}", "You removed system tag %2$s from %1$s" : "Du fjernet system-merkelapp %2$s fra %1$s", diff --git a/apps/systemtags/l10n/nb.json b/apps/systemtags/l10n/nb.json index 17aced80bb2..6c4669bf74c 100644 --- a/apps/systemtags/l10n/nb.json +++ b/apps/systemtags/l10n/nb.json @@ -29,7 +29,7 @@ "%1$s updated system tag %3$s to %2$s" : "%1$s oppdaterte system-merkelapp %3$s til %2$s", "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} oppdaterte system-merkelapp {oldsystemtag} til {newsystemtag}", "You added system tag %2$s to %1$s" : "Du la til system-merkelapp %2$s til %1$s", - "You added system tag {systemtag} to {file}" : "Du la til system-merkelapp {systemtag} til {file}", + "You added system tag {systemtag} to {file}" : "Du la til system merkelapp {systemtag} til {file}", "%1$s added system tag %3$s to %2$s" : "%1$s la til system-merkelapp %3$s til %2$s", "{actor} added system tag {systemtag} to {file}" : "{actor} la til system-merkelapp {systemtag} til {file}", "You removed system tag %2$s from %1$s" : "Du fjernet system-merkelapp %2$s fra %1$s", diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 72286ece4b8..fe1b1d4c17f 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -151,9 +151,14 @@ class ThemingDefaults extends \OC_Defaults { public function getShortFooter() { $slogan = $this->getSlogan(); - $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' . - ' rel="noreferrer noopener">' .$this->getEntity() . '</a>'. - ($slogan !== '' ? ' – ' . $slogan : ''); + $baseUrl = $this->getBaseUrl(); + if ($baseUrl !== '') { + $footer = '<a href="' . $baseUrl . '" target="_blank"' . + ' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>'; + } else { + $footer = '<span class="entity-name">' .$this->getEntity() . '</span>'; + } + $footer .= ($slogan !== '' ? ' – ' . $slogan : ''); $links = [ [ diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 87b2003ded2..5d075709dc5 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -262,7 +262,22 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); + } + + public function testGetShortFooterEmptyUrl() { + $this->config + ->expects($this->exactly(5)) + ->method('getAppValue') + ->willReturnMap([ + ['theming', 'url', $this->defaults->getBaseUrl(), ''], + ['theming', 'name', 'Nextcloud', 'Name'], + ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'], + ['theming', 'imprintUrl', '', ''], + ['theming', 'privacyUrl', '', ''], + ]); + + $this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter()); } public function testGetShortFooterEmptySlogan() { @@ -277,7 +292,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter()); } public function testGetShortFooterImprint() { @@ -297,7 +312,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a>', $this->template->getShortFooter()); } public function testGetShortFooterPrivacy() { @@ -317,7 +332,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); } public function testGetShortFooterAllLegalLinks() { @@ -337,7 +352,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); } public function invalidLegalUrlProvider() { @@ -363,7 +378,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); } /** @@ -382,7 +397,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', $invalidPrivacyUrl], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); } public function testgetColorPrimaryWithDefault() { diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js index 71a025ffe65..8b5b8f86117 100644 --- a/apps/user_ldap/l10n/ast.js +++ b/apps/user_ldap/l10n/ast.js @@ -70,7 +70,6 @@ OC.L10N.register( "Other Attributes:" : "Otros atributos:", "Test Loginname" : "Preba de Nome d'Aniciu de Sesión", "Verify settings" : "Comprobar los axustes", - "1. Server" : "1. Sirvidor", "%s. Server:" : "%s. Sirvidor:", "Copy current configuration into new directory binding" : "Copiar configuración actual nel nuevu directoriu obligatoriu", "Delete the current configuration" : "Desaniciar la configuración actual", @@ -158,6 +157,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Llimpiar l'asignación de los Nomes d'usuariu de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Llimpiar l'asignación de los Nomes de grupu de los grupos de LDAP", " entries available within the provided Base DN" : "entraes disponibles dientro la Base DN proporcionada", + "1. Server" : "1. Sirvidor", "LDAP" : "LDAP", "<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>Avisu:</b> Les apps user_ldap y user_webdavauth son incompatibles. Pues esperimentar un comportamientu inesperáu. Entruga al to alministrador de sistemes pa desactivar una d'elles.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "Los nomes d'usuariu usense p'atroxar (meta) datos. En cuenta d'identificar y reconocer usuarios, cada usuariu de LDAP tendrá'l so nome d'usuariu internu polo que rique un mapéu dende'l so nome d'usuariu al usuariu de LDAP. El nome d'usuariu creáu mapeáse al UUID del usuariu de LDAP. Amás cacheamos tamién la DN p'amenorgar la intecractividá de LDAP, pero ensin usala pa la identificación. Si la DN camuda, atoparanse los cambios. L'usu internu del nome d'usuariu ye perdayures. " diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json index 6ab0cda853b..cfca7f11b19 100644 --- a/apps/user_ldap/l10n/ast.json +++ b/apps/user_ldap/l10n/ast.json @@ -68,7 +68,6 @@ "Other Attributes:" : "Otros atributos:", "Test Loginname" : "Preba de Nome d'Aniciu de Sesión", "Verify settings" : "Comprobar los axustes", - "1. Server" : "1. Sirvidor", "%s. Server:" : "%s. Sirvidor:", "Copy current configuration into new directory binding" : "Copiar configuración actual nel nuevu directoriu obligatoriu", "Delete the current configuration" : "Desaniciar la configuración actual", @@ -156,6 +155,7 @@ "Clear Username-LDAP User Mapping" : "Llimpiar l'asignación de los Nomes d'usuariu de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Llimpiar l'asignación de los Nomes de grupu de los grupos de LDAP", " entries available within the provided Base DN" : "entraes disponibles dientro la Base DN proporcionada", + "1. Server" : "1. Sirvidor", "LDAP" : "LDAP", "<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>Avisu:</b> Les apps user_ldap y user_webdavauth son incompatibles. Pues esperimentar un comportamientu inesperáu. Entruga al to alministrador de sistemes pa desactivar una d'elles.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "Los nomes d'usuariu usense p'atroxar (meta) datos. En cuenta d'identificar y reconocer usuarios, cada usuariu de LDAP tendrá'l so nome d'usuariu internu polo que rique un mapéu dende'l so nome d'usuariu al usuariu de LDAP. El nome d'usuariu creáu mapeáse al UUID del usuariu de LDAP. Amás cacheamos tamién la DN p'amenorgar la intecractividá de LDAP, pero ensin usala pa la identificación. Si la DN camuda, atoparanse los cambios. L'usu internu del nome d'usuariu ye perdayures. " diff --git a/apps/user_ldap/l10n/bg.js b/apps/user_ldap/l10n/bg.js index d620d6e9b28..78db1f4f3f8 100644 --- a/apps/user_ldap/l10n/bg.js +++ b/apps/user_ldap/l10n/bg.js @@ -37,7 +37,6 @@ OC.L10N.register( "Other Attributes:" : "Други атрибути:", "Test Loginname" : "Проверка на Потребителско име", "Verify settings" : "Потвърди настройките", - "1. Server" : "1. Сървър", "%s. Server:" : "%s. Сървър:", "Delete the current configuration" : "Изтриване на текущата конфигурация", "Host" : "Сървър", @@ -96,6 +95,7 @@ OC.L10N.register( "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." : "Обикновено UUID атрибутът ще бъде намерен автоматично. UUID атрибута се използва, за да се идентифицират еднозначно LDAP потребители и групи. Освен това ще бъде генерирано вътрешното име базирано на UUID-то, ако такова не е посочено по-горе. Можете да промените настройката и да използвате атрибут по свой избор. Наложително е атрибутът да бъде уникален както за потребителите така и за групите. Промените ще се отразят само за новодобавени (map-нати) LDAP потребители.", "UUID Attribute for Users:" : "UUID атрибут за потребителите:", "UUID Attribute for Groups:" : "UUID атрибут за групите:", + "1. Server" : "1. Сървър", "LDAP" : "LDAP", "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Моля, помолете системния администратор да изключи едно от приложенията." }, diff --git a/apps/user_ldap/l10n/bg.json b/apps/user_ldap/l10n/bg.json index b9e94e8b1be..07103b3be2d 100644 --- a/apps/user_ldap/l10n/bg.json +++ b/apps/user_ldap/l10n/bg.json @@ -35,7 +35,6 @@ "Other Attributes:" : "Други атрибути:", "Test Loginname" : "Проверка на Потребителско име", "Verify settings" : "Потвърди настройките", - "1. Server" : "1. Сървър", "%s. Server:" : "%s. Сървър:", "Delete the current configuration" : "Изтриване на текущата конфигурация", "Host" : "Сървър", @@ -94,6 +93,7 @@ "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." : "Обикновено UUID атрибутът ще бъде намерен автоматично. UUID атрибута се използва, за да се идентифицират еднозначно LDAP потребители и групи. Освен това ще бъде генерирано вътрешното име базирано на UUID-то, ако такова не е посочено по-горе. Можете да промените настройката и да използвате атрибут по свой избор. Наложително е атрибутът да бъде уникален както за потребителите така и за групите. Промените ще се отразят само за новодобавени (map-нати) LDAP потребители.", "UUID Attribute for Users:" : "UUID атрибут за потребителите:", "UUID Attribute for Groups:" : "UUID атрибут за групите:", + "1. Server" : "1. Сървър", "LDAP" : "LDAP", "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Моля, помолете системния администратор да изключи едно от приложенията." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/user_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js index 43b84360f07..3bdd55d6dcc 100644 --- a/apps/user_ldap/l10n/ca.js +++ b/apps/user_ldap/l10n/ca.js @@ -77,7 +77,6 @@ OC.L10N.register( "Verify settings and count the groups" : "Comprova la configuració i compta els grups", "Other Attributes:" : "Altres atributs:", "Verify settings" : "Comprova la configuració", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Delete the current configuration" : "Esborra la configuració actual", "Host" : "Equip remot", @@ -144,6 +143,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Elimina el mapatge d'usuari Nom d'usuari-LDAP", "Clear Groupname-LDAP Group Mapping" : "Elimina el mapatge de grup Nom de grup-LDAP", " entries available within the provided Base DN" : "les entrades disponibles a la Base DN proporcionada", + "1. Server" : "1. Servidor", "LDAP" : "LDAP", "<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>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una." }, diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json index 3397e5ef871..b38a66b64e7 100644 --- a/apps/user_ldap/l10n/ca.json +++ b/apps/user_ldap/l10n/ca.json @@ -75,7 +75,6 @@ "Verify settings and count the groups" : "Comprova la configuració i compta els grups", "Other Attributes:" : "Altres atributs:", "Verify settings" : "Comprova la configuració", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Delete the current configuration" : "Esborra la configuració actual", "Host" : "Equip remot", @@ -142,6 +141,7 @@ "Clear Username-LDAP User Mapping" : "Elimina el mapatge d'usuari Nom d'usuari-LDAP", "Clear Groupname-LDAP Group Mapping" : "Elimina el mapatge de grup Nom de grup-LDAP", " entries available within the provided Base DN" : "les entrades disponibles a la Base DN proporcionada", + "1. Server" : "1. Servidor", "LDAP" : "LDAP", "<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>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/user_ldap/l10n/cs.js b/apps/user_ldap/l10n/cs.js index 5152d66ab7b..aa73c678c26 100644 --- a/apps/user_ldap/l10n/cs.js +++ b/apps/user_ldap/l10n/cs.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definuje filtr použitý při pokusu o přihlášení. %%uid je nahrazeno uživatelským jménem z přihlašovací akce. Příklad: \"uid=%%uid\"", "Test Loginname" : "Testovací přihlašovací jméno", "Verify settings" : "Ověřit nastavení", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Přidat novou konfiguraci", "Copy current configuration into new directory binding" : "Zkopírovat současnou konfiguraci do nového adresářového propojení", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Zrušit mapování uživatelských jmen LDAPu", "Clear Groupname-LDAP Group Mapping" : "Zrušit mapování názvů skupin LDAPu", " entries available within the provided Base DN" : "záznamů dostupných v zadané Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Chybné heslo. Resetovat?", "LDAP" : "LDAP", "<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 svého správce systému o zakázání jedné z nich.", diff --git a/apps/user_ldap/l10n/cs.json b/apps/user_ldap/l10n/cs.json index e4550ce8907..6252eb8b31c 100644 --- a/apps/user_ldap/l10n/cs.json +++ b/apps/user_ldap/l10n/cs.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definuje filtr použitý při pokusu o přihlášení. %%uid je nahrazeno uživatelským jménem z přihlašovací akce. Příklad: \"uid=%%uid\"", "Test Loginname" : "Testovací přihlašovací jméno", "Verify settings" : "Ověřit nastavení", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Přidat novou konfiguraci", "Copy current configuration into new directory binding" : "Zkopírovat současnou konfiguraci do nového adresářového propojení", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Zrušit mapování uživatelských jmen LDAPu", "Clear Groupname-LDAP Group Mapping" : "Zrušit mapování názvů skupin LDAPu", " entries available within the provided Base DN" : "záznamů dostupných v zadané Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Chybné heslo. Resetovat?", "LDAP" : "LDAP", "<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 svého správce systému o zakázání jedné z nich.", diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js index 6d72da68004..af3605e1e5c 100644 --- a/apps/user_ldap/l10n/da.js +++ b/apps/user_ldap/l10n/da.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filtret der anvendes, når der er forsøg på at logge ind. \"%%uid\" erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uid\"", "Test Loginname" : "Test loginnavn", "Verify settings" : "Kontrollér indstillinger", - "1. Server" : "1. server", "%s. Server:" : "%s. server:", "Add a new configuration" : "Tilføj en ny konfiguration", "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetilknytning", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Ryd kortlægning mellem brugernavn og LDAP-bruger", "Clear Groupname-LDAP Group Mapping" : "Ryd kortlægning mellem gruppenavn og LDAP-gruppe", " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.", + "1. Server" : "1. server", "Wrong password. Reset it?" : "Forkert password.\nSkal det nulstilles?", "LDAP" : "LDAP", "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.", diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json index ab981ea1e50..ceebc496952 100644 --- a/apps/user_ldap/l10n/da.json +++ b/apps/user_ldap/l10n/da.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer filtret der anvendes, når der er forsøg på at logge ind. \"%%uid\" erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uid\"", "Test Loginname" : "Test loginnavn", "Verify settings" : "Kontrollér indstillinger", - "1. Server" : "1. server", "%s. Server:" : "%s. server:", "Add a new configuration" : "Tilføj en ny konfiguration", "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetilknytning", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Ryd kortlægning mellem brugernavn og LDAP-bruger", "Clear Groupname-LDAP Group Mapping" : "Ryd kortlægning mellem gruppenavn og LDAP-gruppe", " entries available within the provided Base DN" : "poster tilgængelige inden for det angivne Base DN.", + "1. Server" : "1. server", "Wrong password. Reset it?" : "Forkert password.\nSkal det nulstilles?", "LDAP" : "LDAP", "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.", diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js index b1074c1206a..737ab9d6014 100644 --- a/apps/user_ldap/l10n/de.js +++ b/apps/user_ldap/l10n/de.js @@ -88,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. \"%%uid\" ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", "Test Loginname" : "Anmeldenamen testen", "Verify settings" : "Einstellungen überprüfen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Neue Konfiguration hinzufügen", "Copy current configuration into new directory binding" : "Aktuelle Konfiguration in eine neues Verzeichnis-Bind kopieren", @@ -189,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen", "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen", " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "LDAP" : "LDAP", "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktiere deinen Systemadministator und bitte ihn um die Deaktivierung einer der beiden Anwendungen.", diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json index fe4890f828d..211e2552d0c 100644 --- a/apps/user_ldap/l10n/de.json +++ b/apps/user_ldap/l10n/de.json @@ -86,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. \"%%uid\" ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", "Test Loginname" : "Anmeldenamen testen", "Verify settings" : "Einstellungen überprüfen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Neue Konfiguration hinzufügen", "Copy current configuration into new directory binding" : "Aktuelle Konfiguration in eine neues Verzeichnis-Bind kopieren", @@ -187,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen", "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen", " entries available within the provided Base DN" : "Einträge in der Vorgesehenen Base DN verfügbar", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "LDAP" : "LDAP", "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktiere deinen Systemadministator und bitte ihn um die Deaktivierung einer der beiden Anwendungen.", diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js index c1e3a7cf114..c23942f5cab 100644 --- a/apps/user_ldap/l10n/de_DE.js +++ b/apps/user_ldap/l10n/de_DE.js @@ -88,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. \"%%uid\" ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", "Test Loginname" : "Anmeldenamen testen", "Verify settings" : "Einstellungen überprüfen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Füge eine neue Konfiguration hinzu.", "Copy current configuration into new directory binding" : "Aktuelle Konfiguration in eine neues Verzeichnis-Bind kopieren ", @@ -189,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung", " entries available within the provided Base DN" : "Einträge in der angegebenen Base DN verfügbar", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "LDAP" : "LDAP", "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.", diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json index d302186ab80..ad7c0a7c3fc 100644 --- a/apps/user_ldap/l10n/de_DE.json +++ b/apps/user_ldap/l10n/de_DE.json @@ -86,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. \"%%uid\" ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"", "Test Loginname" : "Anmeldenamen testen", "Verify settings" : "Einstellungen überprüfen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Füge eine neue Konfiguration hinzu.", "Copy current configuration into new directory binding" : "Aktuelle Konfiguration in eine neues Verzeichnis-Bind kopieren ", @@ -187,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung", "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung", " entries available within the provided Base DN" : "Einträge in der angegebenen Base DN verfügbar", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?", "LDAP" : "LDAP", "<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>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann deshalb zu unerwartetem Systemverhalten kommen. Bitte kontaktieren Sie Ihren Systemadministator und bitten Sie um die Deaktivierung einer der beiden Anwendungen.", diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js index f695d503a4c..6522a044c08 100644 --- a/apps/user_ldap/l10n/el.js +++ b/apps/user_ldap/l10n/el.js @@ -76,7 +76,6 @@ OC.L10N.register( "Other Attributes:" : "Άλλες Ιδιότητες:", "Test Loginname" : "Δοκιμή ", "Verify settings" : "Επιβεβαίωση ρυθμίσεων", - "1. Server" : "1. Διακομιστής", "%s. Server:" : "%s. Διακομιστής:", "Add a new configuration" : "Προσθήκη νέας ρύθμισης", "Copy current configuration into new directory binding" : "Αντιγραφή της τρέχουσας διαμόρφωσης σε νέο κατάλογο", @@ -163,6 +162,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη", "Clear Groupname-LDAP Group Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας", " entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ", + "1. Server" : "1. Διακομιστής", "Wrong password. Reset it?" : "Λάθος συνθηματικο. Επαναφορά;", "LDAP" : "LDAP", "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json index 299a475f9e1..77cd9ae44ec 100644 --- a/apps/user_ldap/l10n/el.json +++ b/apps/user_ldap/l10n/el.json @@ -74,7 +74,6 @@ "Other Attributes:" : "Άλλες Ιδιότητες:", "Test Loginname" : "Δοκιμή ", "Verify settings" : "Επιβεβαίωση ρυθμίσεων", - "1. Server" : "1. Διακομιστής", "%s. Server:" : "%s. Διακομιστής:", "Add a new configuration" : "Προσθήκη νέας ρύθμισης", "Copy current configuration into new directory binding" : "Αντιγραφή της τρέχουσας διαμόρφωσης σε νέο κατάλογο", @@ -161,6 +160,7 @@ "Clear Username-LDAP User Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη", "Clear Groupname-LDAP Group Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας", " entries available within the provided Base DN" : "διαθέσιμες καταχωρήσεις εντός του δηλωθέντος ", + "1. Server" : "1. Διακομιστής", "Wrong password. Reset it?" : "Λάθος συνθηματικο. Επαναφορά;", "LDAP" : "LDAP", "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.", diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js index 0b75790da2a..a5755a6fc44 100644 --- a/apps/user_ldap/l10n/en_GB.js +++ b/apps/user_ldap/l10n/en_GB.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"", "Test Loginname" : "Test Loginname", "Verify settings" : "Verify settings", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Add a new configuration", "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Clear Username-LDAP User Mapping", "Clear Groupname-LDAP Group Mapping" : "Clear Groupname-LDAP Group Mapping", " entries available within the provided Base DN" : " entries available within the provided Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Wrong password. Reset it?", "LDAP" : "LDAP", "<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>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.", diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json index 35ca2857a50..d22bb63a23f 100644 --- a/apps/user_ldap/l10n/en_GB.json +++ b/apps/user_ldap/l10n/en_GB.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"", "Test Loginname" : "Test Loginname", "Verify settings" : "Verify settings", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Add a new configuration", "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Clear Username-LDAP User Mapping", "Clear Groupname-LDAP Group Mapping" : "Clear Groupname-LDAP Group Mapping", " entries available within the provided Base DN" : " entries available within the provided Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Wrong password. Reset it?", "LDAP" : "LDAP", "<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>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.", diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js index 4e6825c7206..88d40274b6f 100644 --- a/apps/user_ldap/l10n/es.js +++ b/apps/user_ldap/l10n/es.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro que aplicar cuando se intenta el registro. \"%%uid\" reemplaza al nombre de usuario en la acción de registro. Ejemplo: \"uid=%%uid\"", "Test Loginname" : "Probar nombre de sesión", "Verify settings" : "Verificar configuración", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la actual configuración en un nuevo directorio de enlace", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP", " entries available within the provided Base DN" : "entradas disponibles dentro de la BaseDN provista", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña errónea. ¿Resetearla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pídale a su administrador del sistema que desactive uno de ellos.", diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json index 8b807abb5d5..d619140d526 100644 --- a/apps/user_ldap/l10n/es.json +++ b/apps/user_ldap/l10n/es.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro que aplicar cuando se intenta el registro. \"%%uid\" reemplaza al nombre de usuario en la acción de registro. Ejemplo: \"uid=%%uid\"", "Test Loginname" : "Probar nombre de sesión", "Verify settings" : "Verificar configuración", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la actual configuración en un nuevo directorio de enlace", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP", " entries available within the provided Base DN" : "entradas disponibles dentro de la BaseDN provista", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña errónea. ¿Resetearla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pídale a su administrador del sistema que desactive uno de ellos.", diff --git a/apps/user_ldap/l10n/es_419.js b/apps/user_ldap/l10n/es_419.js index 9078bc2d9f7..8bbb7d3b671 100644 --- a/apps/user_ldap/l10n/es_419.js +++ b/apps/user_ldap/l10n/es_419.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_419.json b/apps/user_ldap/l10n/es_419.json index 019e7a4ae98..1a1fb0b7532 100644 --- a/apps/user_ldap/l10n/es_419.json +++ b/apps/user_ldap/l10n/es_419.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js index 89f3f1ab5e4..17a88def330 100644 --- a/apps/user_ldap/l10n/es_AR.js +++ b/apps/user_ldap/l10n/es_AR.js @@ -74,7 +74,6 @@ OC.L10N.register( "Other Attributes:" : "Otros atributos:", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -173,6 +172,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Nombres de usuario a los Usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos de LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Desea restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Usted puede expermientar comportamientos inesperados. Favor de solicitar a su administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json index 3337ef175a6..0e6299f3079 100644 --- a/apps/user_ldap/l10n/es_AR.json +++ b/apps/user_ldap/l10n/es_AR.json @@ -72,7 +72,6 @@ "Other Attributes:" : "Otros atributos:", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -171,6 +170,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Nombres de usuario a los Usuarios LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos de LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Desea restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Usted puede expermientar comportamientos inesperados. Favor de solicitar a su administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CL.js b/apps/user_ldap/l10n/es_CL.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_CL.js +++ b/apps/user_ldap/l10n/es_CL.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CL.json b/apps/user_ldap/l10n/es_CL.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_CL.json +++ b/apps/user_ldap/l10n/es_CL.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CO.js b/apps/user_ldap/l10n/es_CO.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_CO.js +++ b/apps/user_ldap/l10n/es_CO.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CO.json b/apps/user_ldap/l10n/es_CO.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_CO.json +++ b/apps/user_ldap/l10n/es_CO.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CR.js b/apps/user_ldap/l10n/es_CR.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_CR.js +++ b/apps/user_ldap/l10n/es_CR.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_CR.json b/apps/user_ldap/l10n/es_CR.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_CR.json +++ b/apps/user_ldap/l10n/es_CR.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_DO.js b/apps/user_ldap/l10n/es_DO.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_DO.js +++ b/apps/user_ldap/l10n/es_DO.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_DO.json b/apps/user_ldap/l10n/es_DO.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_DO.json +++ b/apps/user_ldap/l10n/es_DO.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_EC.js b/apps/user_ldap/l10n/es_EC.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_EC.js +++ b/apps/user_ldap/l10n/es_EC.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_EC.json b/apps/user_ldap/l10n/es_EC.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_EC.json +++ b/apps/user_ldap/l10n/es_EC.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_GT.js b/apps/user_ldap/l10n/es_GT.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_GT.js +++ b/apps/user_ldap/l10n/es_GT.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_GT.json b/apps/user_ldap/l10n/es_GT.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_GT.json +++ b/apps/user_ldap/l10n/es_GT.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_HN.js b/apps/user_ldap/l10n/es_HN.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_HN.js +++ b/apps/user_ldap/l10n/es_HN.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_HN.json b/apps/user_ldap/l10n/es_HN.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_HN.json +++ b/apps/user_ldap/l10n/es_HN.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_MX.js b/apps/user_ldap/l10n/es_MX.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_MX.js +++ b/apps/user_ldap/l10n/es_MX.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_MX.json b/apps/user_ldap/l10n/es_MX.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_MX.json +++ b/apps/user_ldap/l10n/es_MX.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_NI.js b/apps/user_ldap/l10n/es_NI.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_NI.js +++ b/apps/user_ldap/l10n/es_NI.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_NI.json b/apps/user_ldap/l10n/es_NI.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_NI.json +++ b/apps/user_ldap/l10n/es_NI.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PA.js b/apps/user_ldap/l10n/es_PA.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_PA.js +++ b/apps/user_ldap/l10n/es_PA.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PA.json b/apps/user_ldap/l10n/es_PA.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_PA.json +++ b/apps/user_ldap/l10n/es_PA.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PE.js b/apps/user_ldap/l10n/es_PE.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_PE.js +++ b/apps/user_ldap/l10n/es_PE.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PE.json b/apps/user_ldap/l10n/es_PE.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_PE.json +++ b/apps/user_ldap/l10n/es_PE.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PR.js b/apps/user_ldap/l10n/es_PR.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_PR.js +++ b/apps/user_ldap/l10n/es_PR.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PR.json b/apps/user_ldap/l10n/es_PR.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_PR.json +++ b/apps/user_ldap/l10n/es_PR.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PY.js b/apps/user_ldap/l10n/es_PY.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_PY.js +++ b/apps/user_ldap/l10n/es_PY.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_PY.json b/apps/user_ldap/l10n/es_PY.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_PY.json +++ b/apps/user_ldap/l10n/es_PY.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_SV.js b/apps/user_ldap/l10n/es_SV.js index 43b8b6f03aa..4534ccd82f0 100644 --- a/apps/user_ldap/l10n/es_SV.js +++ b/apps/user_ldap/l10n/es_SV.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_SV.json b/apps/user_ldap/l10n/es_SV.json index 33185152d2c..92a90ad6ea2 100644 --- a/apps/user_ldap/l10n/es_SV.json +++ b/apps/user_ldap/l10n/es_SV.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_UY.js b/apps/user_ldap/l10n/es_UY.js index 7d56d01533d..8b919f8dd7e 100644 --- a/apps/user_ldap/l10n/es_UY.js +++ b/apps/user_ldap/l10n/es_UY.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/es_UY.json b/apps/user_ldap/l10n/es_UY.json index af406eb1c55..3f711feabfa 100644 --- a/apps/user_ldap/l10n/es_UY.json +++ b/apps/user_ldap/l10n/es_UY.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta iniciar sesión. \"%% uid\" remplaza el usuario en la acción de inicio de sesión. Ejemplo: \"uid=%% uid\"", "Test Loginname" : "Probar nombre de usuario", "Verify settings" : "Verificar configuraciones ", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Agregar una nueva configuración", "Copy current configuration into new directory binding" : "Copiar la configuración actual a un nuevo directorio de vinculación", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Borrar el mapeo de los Usuarios a los Usuarios-LDAP", "Clear Groupname-LDAP Group Mapping" : "Borrar el mapeo de los Nombres de grupo a los grupos-LDAP", " entries available within the provided Base DN" : "elementos disponibles dentro del DN Base proporcionado", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Deseas restablecerla?", "LDAP" : "LDAP", "<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>Advertencia:</b> Las aplicaciones user_ldap y user_webdavauth son incompatibles. Puedes expermientar comportamientos inesperados. Por favor solicita a tu administrador del sistema deshabilitar alguno de ellos.", diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js index f3d72136da2..cd110d3a9e9 100644 --- a/apps/user_ldap/l10n/et_EE.js +++ b/apps/user_ldap/l10n/et_EE.js @@ -64,7 +64,6 @@ OC.L10N.register( "Other Attributes:" : "Muud atribuudid:", "Test Loginname" : "Testi kasutajanime", "Verify settings" : "Kontrolli seadeid", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Delete the current configuration" : "Kustuta praegune seadistus", "Host" : "Host", @@ -147,6 +146,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus", "Clear Groupname-LDAP Group Mapping" : "Puhasta LDAP-Grupinimi Grupp Vastendus", " entries available within the provided Base DN" : "kirjet saadaval ette enatud BaasDN-is.", + "1. Server" : "1. Server", "LDAP" : "LDAP", "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada." }, diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json index eef1bb12da3..1e131437ffe 100644 --- a/apps/user_ldap/l10n/et_EE.json +++ b/apps/user_ldap/l10n/et_EE.json @@ -62,7 +62,6 @@ "Other Attributes:" : "Muud atribuudid:", "Test Loginname" : "Testi kasutajanime", "Verify settings" : "Kontrolli seadeid", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Delete the current configuration" : "Kustuta praegune seadistus", "Host" : "Host", @@ -145,6 +144,7 @@ "Clear Username-LDAP User Mapping" : "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus", "Clear Groupname-LDAP Group Mapping" : "Puhasta LDAP-Grupinimi Grupp Vastendus", " entries available within the provided Base DN" : "kirjet saadaval ette enatud BaasDN-is.", + "1. Server" : "1. Server", "LDAP" : "LDAP", "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js index 87e76eb4b62..8a02596791d 100644 --- a/apps/user_ldap/l10n/eu.js +++ b/apps/user_ldap/l10n/eu.js @@ -46,7 +46,6 @@ OC.L10N.register( "Other Attributes:" : "Bestelako atributuak:", "Test Loginname" : "Egiaztatu Saioa hasteko izena", "Verify settings" : "Egiaztatu ezarpenak", - "1. Server" : "1. Zerbitzaria", "%s. Server:" : "%s. Zerbitzaria:", "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian", "Delete the current configuration" : "Ezabatu uneko konfigurazioa", @@ -117,6 +116,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa", "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa", " entries available within the provided Base DN" : "sarrera eskuragarri emandako Oinarrizko DNarekin", + "1. Server" : "1. Zerbitzaria", "LDAP" : "LDAP", "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko." }, diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json index e4a65813b36..2c80807351c 100644 --- a/apps/user_ldap/l10n/eu.json +++ b/apps/user_ldap/l10n/eu.json @@ -44,7 +44,6 @@ "Other Attributes:" : "Bestelako atributuak:", "Test Loginname" : "Egiaztatu Saioa hasteko izena", "Verify settings" : "Egiaztatu ezarpenak", - "1. Server" : "1. Zerbitzaria", "%s. Server:" : "%s. Zerbitzaria:", "Copy current configuration into new directory binding" : "Kopiatu uneko konfigurazioa direktorio lotura berrian", "Delete the current configuration" : "Ezabatu uneko konfigurazioa", @@ -115,6 +114,7 @@ "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa", "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa", " entries available within the provided Base DN" : "sarrera eskuragarri emandako Oinarrizko DNarekin", + "1. Server" : "1. Zerbitzaria", "LDAP" : "LDAP", "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js index 75fa02d49eb..1ff5a1f1f3e 100644 --- a/apps/user_ldap/l10n/fr.js +++ b/apps/user_ldap/l10n/fr.js @@ -65,6 +65,8 @@ OC.L10N.register( "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres LDAP avancés.", "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée", "Invalid Host" : "Hôte non valide", + "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "Cette application autorise les administrateurs à connecter Nextcloud à un annuaire LDAP.", + "This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.\n\nA user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation." : "Cette application permet aux administrateurs de connecter Nextcloud à un répertoire d'utilisateurs LDAP pour l'authentification et le provisionnement des utilisateurs, groupes et des attributs d'utilisateurs. Les administrateurs peuvent configurer cette application pour se connecter à un ou plusieurs répertoires LDAP ou Active Directories via une interface LDAP. Les attributs tels que le quota utilisateur, l'email, les images d'avatar, les adhésions de groupe et plus peuvent être envoyés sur Nextcloud à partir d'un répertoire avec les requêtes et les filtres appropriés.\n\nUn utilisateur se connecte à Nextcloud avec ses identifiants LDAP ou AD et obtient l'accès sur la base d'une demande d'authentification gérée par le serveur LDAP ou AD. Nextcloud ne stocke pas les mots de passe LDAP ou AD, mais ces informations d'identification sont utilisées pour authentifier un utilisateur et Nextcloud utilise ensuite une session pour l'ID utilisateur. De plus amples informations sont disponibles dans la documentation LDAP User and Group Backend.", "Test Configuration" : "Tester la configuration", "Help" : "Aide", "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :", @@ -86,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors de la tentative de connexion. \"%%uid\" remplace le nom d'utilisateur lors de l'authentification. Exemple: \"uid=%%uid\"", "Test Loginname" : "Loginname de test", "Verify settings" : "Tester les paramètres", - "1. Server" : "1. Serveur", "%s. Server:" : "%s. Serveur :", "Add a new configuration" : "Ajouter une nouvelle configuration", "Copy current configuration into new directory binding" : "Copier la configuration actuelle vers une nouvelle", @@ -187,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP", " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié", + "1. Server" : "1. Serveur", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", "LDAP" : "LDAP", "<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>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il en désactive une.", diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json index 43e6ca91ecb..ecc8958a8ac 100644 --- a/apps/user_ldap/l10n/fr.json +++ b/apps/user_ldap/l10n/fr.json @@ -63,6 +63,8 @@ "Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres LDAP avancés.", "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée", "Invalid Host" : "Hôte non valide", + "This application enables administrators to connect Nextcloud to an LDAP-based user directory." : "Cette application autorise les administrateurs à connecter Nextcloud à un annuaire LDAP.", + "This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.\n\nA user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation." : "Cette application permet aux administrateurs de connecter Nextcloud à un répertoire d'utilisateurs LDAP pour l'authentification et le provisionnement des utilisateurs, groupes et des attributs d'utilisateurs. Les administrateurs peuvent configurer cette application pour se connecter à un ou plusieurs répertoires LDAP ou Active Directories via une interface LDAP. Les attributs tels que le quota utilisateur, l'email, les images d'avatar, les adhésions de groupe et plus peuvent être envoyés sur Nextcloud à partir d'un répertoire avec les requêtes et les filtres appropriés.\n\nUn utilisateur se connecte à Nextcloud avec ses identifiants LDAP ou AD et obtient l'accès sur la base d'une demande d'authentification gérée par le serveur LDAP ou AD. Nextcloud ne stocke pas les mots de passe LDAP ou AD, mais ces informations d'identification sont utilisées pour authentifier un utilisateur et Nextcloud utilise ensuite une session pour l'ID utilisateur. De plus amples informations sont disponibles dans la documentation LDAP User and Group Backend.", "Test Configuration" : "Tester la configuration", "Help" : "Aide", "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :", @@ -84,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit le filtre à appliquer lors de la tentative de connexion. \"%%uid\" remplace le nom d'utilisateur lors de l'authentification. Exemple: \"uid=%%uid\"", "Test Loginname" : "Loginname de test", "Verify settings" : "Tester les paramètres", - "1. Server" : "1. Serveur", "%s. Server:" : "%s. Serveur :", "Add a new configuration" : "Ajouter une nouvelle configuration", "Copy current configuration into new directory binding" : "Copier la configuration actuelle vers une nouvelle", @@ -185,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP", "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP", " entries available within the provided Base DN" : "entrées disponibles dans le DN de base spécifié", + "1. Server" : "1. Serveur", "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?", "LDAP" : "LDAP", "<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>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il en désactive une.", diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js index c870803b0d5..59931bfc711 100644 --- a/apps/user_ldap/l10n/he.js +++ b/apps/user_ldap/l10n/he.js @@ -80,7 +80,6 @@ OC.L10N.register( "Other Attributes:" : "מאפיינים נוספים:", "Test Loginname" : "בדיקת שם התחברות", "Verify settings" : "מאמת הגדרות", - "1. Server" : "1. שרת", "%s. Server:" : "%s. שרת:", "Add a new configuration" : "הוספת תצורה חדשה", "Copy current configuration into new directory binding" : "מעתיק תצורה נוכחית אל תוך תיקייה חדשה", @@ -165,6 +164,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:", "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:", " entries available within the provided Base DN" : " קיימות רשומות מתוך בסיס ה- DN שסופק", + "1. Server" : "1. שרת", "Wrong password. Reset it?" : "ססמה שגויה. לאפס אותה?", "LDAP" : "LDAP", "<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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם." diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json index d2357ab25b4..184a2f67edd 100644 --- a/apps/user_ldap/l10n/he.json +++ b/apps/user_ldap/l10n/he.json @@ -78,7 +78,6 @@ "Other Attributes:" : "מאפיינים נוספים:", "Test Loginname" : "בדיקת שם התחברות", "Verify settings" : "מאמת הגדרות", - "1. Server" : "1. שרת", "%s. Server:" : "%s. שרת:", "Add a new configuration" : "הוספת תצורה חדשה", "Copy current configuration into new directory binding" : "מעתיק תצורה נוכחית אל תוך תיקייה חדשה", @@ -163,6 +162,7 @@ "Clear Username-LDAP User Mapping" : "ניקוי מיפוי שם משתמש LDAP:", "Clear Groupname-LDAP Group Mapping" : "ניקוי מיפוי שם משתמש קבוצה LDAP:", " entries available within the provided Base DN" : " קיימות רשומות מתוך בסיס ה- DN שסופק", + "1. Server" : "1. שרת", "Wrong password. Reset it?" : "ססמה שגויה. לאפס אותה?", "LDAP" : "LDAP", "<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>אזהרה:</b> יישומים user_ldap ו- user_webdavauth אינם תואמים. תופעות לא מוסברות עלולות להתקיים. כדאי לפנות למנהל המערכת כדי שינטרל אחד מהם." diff --git a/apps/user_ldap/l10n/hu.js b/apps/user_ldap/l10n/hu.js index b008bebc32b..7b12424b429 100644 --- a/apps/user_ldap/l10n/hu.js +++ b/apps/user_ldap/l10n/hu.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "A belépéskor alkalmazandó filtert definiálja. \"%%uid\" lecseréli a felhasználónevez a bejelentkezésnél. Példa: \"uid=%%uid\"", "Test Loginname" : "Teszt bejelentkezési név", "Verify settings" : "Beállítások ellenőrzése", - "1. Server" : "1. Szerver", "%s. Server:" : "%s. szerver", "Add a new configuration" : "Új beállítás hozzáadása", "Copy current configuration into new directory binding" : "Jelenlegi beállítások másolása egy új mappakötésbe", @@ -186,6 +185,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "A felhasználó - LDAP felhasználó hozzárendelés törlése", "Clear Groupname-LDAP Group Mapping" : "A csoport - LDAP csoport hozzárendelés törlése", " entries available within the provided Base DN" : "a megadott címtár gyökér alatt elérhető bejegyzések", + "1. Server" : "1. Szerver", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "LDAP" : "LDAP", "<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.", diff --git a/apps/user_ldap/l10n/hu.json b/apps/user_ldap/l10n/hu.json index 8561f5dcb25..eb371ce986d 100644 --- a/apps/user_ldap/l10n/hu.json +++ b/apps/user_ldap/l10n/hu.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "A belépéskor alkalmazandó filtert definiálja. \"%%uid\" lecseréli a felhasználónevez a bejelentkezésnél. Példa: \"uid=%%uid\"", "Test Loginname" : "Teszt bejelentkezési név", "Verify settings" : "Beállítások ellenőrzése", - "1. Server" : "1. Szerver", "%s. Server:" : "%s. szerver", "Add a new configuration" : "Új beállítás hozzáadása", "Copy current configuration into new directory binding" : "Jelenlegi beállítások másolása egy új mappakötésbe", @@ -184,6 +183,7 @@ "Clear Username-LDAP User Mapping" : "A felhasználó - LDAP felhasználó hozzárendelés törlése", "Clear Groupname-LDAP Group Mapping" : "A csoport - LDAP csoport hozzárendelés törlése", " entries available within the provided Base DN" : "a megadott címtár gyökér alatt elérhető bejegyzések", + "1. Server" : "1. Szerver", "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?", "LDAP" : "LDAP", "<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.", diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js index df238febe6a..2ac564b5bb9 100644 --- a/apps/user_ldap/l10n/id.js +++ b/apps/user_ldap/l10n/id.js @@ -61,7 +61,6 @@ OC.L10N.register( "Other Attributes:" : "Atribut Lain:", "Test Loginname" : "Test Loginname", "Verify settings" : "Verifikasi setelan", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Copy current configuration into new directory binding" : "Salin konfigurasi saat ini kedalam direktori baru", "Delete the current configuration" : "Hapus konfigurasi saat ini", @@ -144,6 +143,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Bersihkan Pemetaan Pengguna LDAP-Nama pengguna", "Clear Groupname-LDAP Group Mapping" : "Bersihkan Pemetaan Grup LDAP-Nama grup", " entries available within the provided Base DN" : "entri tersedia didalam Base DN yang diberikan", + "1. Server" : "1. Server", "LDAP" : "LDAP", "<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>Peringatan:</b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami perilaku yang tidak terduga. Silakan minta administrator Anda untuk menonaktifkan salah satunya.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "Nama pengguna digunakan untuk menyimpan dan menetapkan (meta) data. Dalam rangka untuk mengidentifikasi dan mengenali pengguna secara tepat, setiap pengguna LDAP akan memiliki nama pengguna internal. Hal ini memerlukan sebuah pemetaan dari nama pengguna ke pengguna LDAP. Nama pengguna yang dibuat akan dipetakan pada UUID pengguna LDAP. Selain itu, DN akan di cache untuk mengurangi interaksi LDAP, tetapi tidak digunakan untuk identifikasi. Jika DN berubah, perubahan akan ditemukan. Nama pengguna internal digunakan secara menyeluruh. Membersihkan pemetaan akan mempengaruhi semua konfigurasi LDAP! JANGAN PERNAH MENGHAPUS PEMETAAN PADA LINGKUNGAN PRODUKSI, hanya gunakan dalam tahap uji coba dan pengujian." diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json index e1cd9d7e775..2fb17aee26d 100644 --- a/apps/user_ldap/l10n/id.json +++ b/apps/user_ldap/l10n/id.json @@ -59,7 +59,6 @@ "Other Attributes:" : "Atribut Lain:", "Test Loginname" : "Test Loginname", "Verify settings" : "Verifikasi setelan", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Copy current configuration into new directory binding" : "Salin konfigurasi saat ini kedalam direktori baru", "Delete the current configuration" : "Hapus konfigurasi saat ini", @@ -142,6 +141,7 @@ "Clear Username-LDAP User Mapping" : "Bersihkan Pemetaan Pengguna LDAP-Nama pengguna", "Clear Groupname-LDAP Group Mapping" : "Bersihkan Pemetaan Grup LDAP-Nama grup", " entries available within the provided Base DN" : "entri tersedia didalam Base DN yang diberikan", + "1. Server" : "1. Server", "LDAP" : "LDAP", "<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>Peringatan:</b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami perilaku yang tidak terduga. Silakan minta administrator Anda untuk menonaktifkan salah satunya.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "Nama pengguna digunakan untuk menyimpan dan menetapkan (meta) data. Dalam rangka untuk mengidentifikasi dan mengenali pengguna secara tepat, setiap pengguna LDAP akan memiliki nama pengguna internal. Hal ini memerlukan sebuah pemetaan dari nama pengguna ke pengguna LDAP. Nama pengguna yang dibuat akan dipetakan pada UUID pengguna LDAP. Selain itu, DN akan di cache untuk mengurangi interaksi LDAP, tetapi tidak digunakan untuk identifikasi. Jika DN berubah, perubahan akan ditemukan. Nama pengguna internal digunakan secara menyeluruh. Membersihkan pemetaan akan mempengaruhi semua konfigurasi LDAP! JANGAN PERNAH MENGHAPUS PEMETAAN PADA LINGKUNGAN PRODUKSI, hanya gunakan dalam tahap uji coba dan pengujian." diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js index 6c363f27fa7..54c6d28ba15 100644 --- a/apps/user_ldap/l10n/is.js +++ b/apps/user_ldap/l10n/is.js @@ -57,7 +57,6 @@ OC.L10N.register( "Other Attributes:" : "Önnur eigindi:", "Test Loginname" : "Prófa innskráningarnafn", "Verify settings" : "Sannprófa stillingar", - "1. Server" : "1. Þjónn", "%s. Server:" : "%s. Þjónn:", "Add a new configuration" : "Bæta við nýrri uppsetningu", "Delete the current configuration" : "Eyða núgildandi uppsetningu", @@ -97,6 +96,7 @@ OC.L10N.register( "Quota Default" : "Sjálfgefinn kvóti", "Email Field" : "Gagnasvið fyrir netfang", "Internal Username" : "Innra notandanafn", + "1. Server" : "1. Þjónn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", "LDAP" : "LDAP" }, diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json index 2acb12cd51b..42601626915 100644 --- a/apps/user_ldap/l10n/is.json +++ b/apps/user_ldap/l10n/is.json @@ -55,7 +55,6 @@ "Other Attributes:" : "Önnur eigindi:", "Test Loginname" : "Prófa innskráningarnafn", "Verify settings" : "Sannprófa stillingar", - "1. Server" : "1. Þjónn", "%s. Server:" : "%s. Þjónn:", "Add a new configuration" : "Bæta við nýrri uppsetningu", "Delete the current configuration" : "Eyða núgildandi uppsetningu", @@ -95,6 +94,7 @@ "Quota Default" : "Sjálfgefinn kvóti", "Email Field" : "Gagnasvið fyrir netfang", "Internal Username" : "Innra notandanafn", + "1. Server" : "1. Þjónn", "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?", "LDAP" : "LDAP" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js index f4065efe2ca..f9285374433 100644 --- a/apps/user_ldap/l10n/it.js +++ b/apps/user_ldap/l10n/it.js @@ -88,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definisce i filtri da applicare quando viene eseguito il tentativo di accesso. \"%%uid\" rimpiazza il nome utente nell'azione di accesso. Esempio: \"uid=%%uid\"", "Test Loginname" : "Prova nome di accesso", "Verify settings" : "Verifica impostazioni", - "1. Server" : "1. server", "%s. Server:" : "%s. server:", "Add a new configuration" : "Aggiungi una nuova configurazione", "Copy current configuration into new directory binding" : "Copia la configurazione attuale nella nuova cartella associata", @@ -189,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Cancella associazione Nome utente-Utente LDAP", "Clear Groupname-LDAP Group Mapping" : "Cancella associazione Nome gruppo-Gruppo LDAP", " entries available within the provided Base DN" : "voci disponibili all'interno del DN base", + "1. Server" : "1. server", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", "LDAP" : "LDAP", "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.", diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json index a116732d855..2118f253e19 100644 --- a/apps/user_ldap/l10n/it.json +++ b/apps/user_ldap/l10n/it.json @@ -86,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definisce i filtri da applicare quando viene eseguito il tentativo di accesso. \"%%uid\" rimpiazza il nome utente nell'azione di accesso. Esempio: \"uid=%%uid\"", "Test Loginname" : "Prova nome di accesso", "Verify settings" : "Verifica impostazioni", - "1. Server" : "1. server", "%s. Server:" : "%s. server:", "Add a new configuration" : "Aggiungi una nuova configurazione", "Copy current configuration into new directory binding" : "Copia la configurazione attuale nella nuova cartella associata", @@ -187,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "Cancella associazione Nome utente-Utente LDAP", "Clear Groupname-LDAP Group Mapping" : "Cancella associazione Nome gruppo-Gruppo LDAP", " entries available within the provided Base DN" : "voci disponibili all'interno del DN base", + "1. Server" : "1. server", "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?", "LDAP" : "LDAP", "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.", diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js index b3be19e7779..be324b6c708 100644 --- a/apps/user_ldap/l10n/ja.js +++ b/apps/user_ldap/l10n/ja.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。uid \"%%\" にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", "Test Loginname" : "テスト用ログイン名", "Verify settings" : "設定のチェック", - "1. Server" : "1. Server", "%s. Server:" : "%s. サーバー:", "Add a new configuration" : "新しい設定を追加", "Copy current configuration into new directory binding" : "現在の設定を新しいディレクトリ設定にコピー", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする", "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする", " entries available within the provided Base DN" : "入力されたベースDNでエントリーが利用可能", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", "LDAP" : "LDAP", "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。", diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json index a54cce90ec8..15b7bad4431 100644 --- a/apps/user_ldap/l10n/ja.json +++ b/apps/user_ldap/l10n/ja.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルターを定義します。uid \"%%\" にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"", "Test Loginname" : "テスト用ログイン名", "Verify settings" : "設定のチェック", - "1. Server" : "1. Server", "%s. Server:" : "%s. サーバー:", "Add a new configuration" : "新しい設定を追加", "Copy current configuration into new directory binding" : "現在の設定を新しいディレクトリ設定にコピー", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする", "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする", " entries available within the provided Base DN" : "入力されたベースDNでエントリーが利用可能", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？", "LDAP" : "LDAP", "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。", diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js index 393777ac844..491289738e2 100644 --- a/apps/user_ldap/l10n/ka_GE.js +++ b/apps/user_ldap/l10n/ka_GE.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "ავტორიზაციის მცდელობისას საზღვრავს მიღების ფილტრს. \"%%uid\" ავტორიზაციის ქმედებაში ანაცვლებს მომხმარებლის სახელს. მაგალითი: \"uid=%%uid\"", "Test Loginname" : "შემოწმების ლოგინის სახელი", "Verify settings" : "პარამეტრების დამოწმება", - "1. Server" : "1. სერვერი", "%s. Server:" : "%s. სერვერი:", "Add a new configuration" : "ახალი კონფიგურაციის დამატება", "Copy current configuration into new directory binding" : "ამჟამინდელი კონფიგურაციის კოპირება ახალი დირექტორიის ბმაში", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Username-LDAP მომხმარებლის ბმების გასუფთავება", "Clear Groupname-LDAP Group Mapping" : "Groupname-LDAP ჯგუფის ბმების გასუფთავება", " entries available within the provided Base DN" : "მითითებულ საბაზისო DN-ში შენატანები ხელმისაწვდომია", + "1. Server" : "1. სერვერი", "Wrong password. Reset it?" : "არასწორი პაროლი. აღვადგინოთ?", "LDAP" : "LDAP", "<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>გაფრთხილება:</b> აპლიკაციები user_ldap და user_webdavauth არაა თავსებადი. შესაძლოა შეგვხდეთ მოულოდნელი ქმედება. გთხოვთ სთხოვოთ თქვენი სისტემის ადმინისტრატორს ერთ-ერთის გათიშვა.", diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json index b3f9cc9639c..95aaef880d7 100644 --- a/apps/user_ldap/l10n/ka_GE.json +++ b/apps/user_ldap/l10n/ka_GE.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "ავტორიზაციის მცდელობისას საზღვრავს მიღების ფილტრს. \"%%uid\" ავტორიზაციის ქმედებაში ანაცვლებს მომხმარებლის სახელს. მაგალითი: \"uid=%%uid\"", "Test Loginname" : "შემოწმების ლოგინის სახელი", "Verify settings" : "პარამეტრების დამოწმება", - "1. Server" : "1. სერვერი", "%s. Server:" : "%s. სერვერი:", "Add a new configuration" : "ახალი კონფიგურაციის დამატება", "Copy current configuration into new directory binding" : "ამჟამინდელი კონფიგურაციის კოპირება ახალი დირექტორიის ბმაში", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Username-LDAP მომხმარებლის ბმების გასუფთავება", "Clear Groupname-LDAP Group Mapping" : "Groupname-LDAP ჯგუფის ბმების გასუფთავება", " entries available within the provided Base DN" : "მითითებულ საბაზისო DN-ში შენატანები ხელმისაწვდომია", + "1. Server" : "1. სერვერი", "Wrong password. Reset it?" : "არასწორი პაროლი. აღვადგინოთ?", "LDAP" : "LDAP", "<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>გაფრთხილება:</b> აპლიკაციები user_ldap და user_webdavauth არაა თავსებადი. შესაძლოა შეგვხდეთ მოულოდნელი ქმედება. გთხოვთ სთხოვოთ თქვენი სისტემის ადმინისტრატორს ერთ-ერთის გათიშვა.", diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js index b0f8a68fce9..1e0c16da142 100644 --- a/apps/user_ldap/l10n/ko.js +++ b/apps/user_ldap/l10n/ko.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도했을 때 적용할 필터를 지정합니다. \"%%uid\"는 로그인을 시도한 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"", "Test Loginname" : "로그인 이름 테스트", "Verify settings" : "설정 검사", - "1. Server" : "1. 서버", "%s. Server:" : "%s. 서버:", "Add a new configuration" : "새 설정 추가", "Copy current configuration into new directory binding" : "현재 설정을 새 디렉터리 바인딩으로 복사", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑 비우기", "Clear Groupname-LDAP Group Mapping" : "그룹 이름-LDAP 그룹 매핑 비우기", " entries available within the provided Base DN" : "개(지정한 DN의 기본 항목 수)", + "1. Server" : "1. 서버", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 초기화하시겠습니까?", "LDAP" : "LDAP", "<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>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.", diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json index ec5c1beea61..c7b0068d5e8 100644 --- a/apps/user_ldap/l10n/ko.json +++ b/apps/user_ldap/l10n/ko.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도했을 때 적용할 필터를 지정합니다. \"%%uid\"는 로그인을 시도한 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"", "Test Loginname" : "로그인 이름 테스트", "Verify settings" : "설정 검사", - "1. Server" : "1. 서버", "%s. Server:" : "%s. 서버:", "Add a new configuration" : "새 설정 추가", "Copy current configuration into new directory binding" : "현재 설정을 새 디렉터리 바인딩으로 복사", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑 비우기", "Clear Groupname-LDAP Group Mapping" : "그룹 이름-LDAP 그룹 매핑 비우기", " entries available within the provided Base DN" : "개(지정한 DN의 기본 항목 수)", + "1. Server" : "1. 서버", "Wrong password. Reset it?" : "암호가 잘못되었습니다. 초기화하시겠습니까?", "LDAP" : "LDAP", "<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>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.", diff --git a/apps/user_ldap/l10n/lt_LT.js b/apps/user_ldap/l10n/lt_LT.js index e6d0d157332..5ed12979bba 100644 --- a/apps/user_ldap/l10n/lt_LT.js +++ b/apps/user_ldap/l10n/lt_LT.js @@ -80,7 +80,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Apibrėžia filtrą, kuris taikomas bandant prisijungti. \"%%uid\" pakeičia naudotojo vardą prisijungimo metu. Pavyzdys: \"uid=%%uid\"", "Test Loginname" : "Ištestuokite prisijungimo vardą", "Verify settings" : "Patikrinti nustatymus", - "1. Server" : "1. Serveris", "%s. Server:" : "%s. Serveris:", "Add a new configuration" : "Pridėti naują konfigūraciją", "Copy current configuration into new directory binding" : "Nukopijuokite dabartinę konfigūraciją į naują katalogų saistymą", @@ -175,6 +174,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Išvalyti naudotojo vardo - LDAP naudotojo sąsają", "Clear Groupname-LDAP Group Mapping" : "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają", " entries available within the provided Base DN" : "pasiekiami įrašai pateiktoje DN šakoje", + "1. Server" : "1. Serveris", "Wrong password. Reset it?" : "Neteisingas slaptažodis. Atstatyti jį?", "LDAP" : "LDAP", "<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>Įspėjimas: </b> Programėlės user_ldap ir user_webdavauth yra nesuderinami. Tai gali sukelti nepageidaujamą veikimą. Paprašykite, kad sistemos administratorius vieną jų išjungtų.", diff --git a/apps/user_ldap/l10n/lt_LT.json b/apps/user_ldap/l10n/lt_LT.json index 807ea15a984..272b822a2fb 100644 --- a/apps/user_ldap/l10n/lt_LT.json +++ b/apps/user_ldap/l10n/lt_LT.json @@ -78,7 +78,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Apibrėžia filtrą, kuris taikomas bandant prisijungti. \"%%uid\" pakeičia naudotojo vardą prisijungimo metu. Pavyzdys: \"uid=%%uid\"", "Test Loginname" : "Ištestuokite prisijungimo vardą", "Verify settings" : "Patikrinti nustatymus", - "1. Server" : "1. Serveris", "%s. Server:" : "%s. Serveris:", "Add a new configuration" : "Pridėti naują konfigūraciją", "Copy current configuration into new directory binding" : "Nukopijuokite dabartinę konfigūraciją į naują katalogų saistymą", @@ -173,6 +172,7 @@ "Clear Username-LDAP User Mapping" : "Išvalyti naudotojo vardo - LDAP naudotojo sąsają", "Clear Groupname-LDAP Group Mapping" : "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają", " entries available within the provided Base DN" : "pasiekiami įrašai pateiktoje DN šakoje", + "1. Server" : "1. Serveris", "Wrong password. Reset it?" : "Neteisingas slaptažodis. Atstatyti jį?", "LDAP" : "LDAP", "<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>Įspėjimas: </b> Programėlės user_ldap ir user_webdavauth yra nesuderinami. Tai gali sukelti nepageidaujamą veikimą. Paprašykite, kad sistemos administratorius vieną jų išjungtų.", diff --git a/apps/user_ldap/l10n/lv.js b/apps/user_ldap/l10n/lv.js index 52b581feb19..03800d677e4 100644 --- a/apps/user_ldap/l10n/lv.js +++ b/apps/user_ldap/l10n/lv.js @@ -48,7 +48,6 @@ OC.L10N.register( "Other Attributes:" : "Citi atribūti:", "Test Loginname" : "Pārbaudiet lietotājvārdu", "Verify settings" : "Pārbaudīt iestatījumus", - "1. Server" : "1. Serveris", "%s. Server:" : "%s. Serveris:", "Host" : "Resursdators", "Port" : "Ports", @@ -105,6 +104,7 @@ OC.L10N.register( "UUID Attribute for Users:" : "UUID atribūti lietotājiem:", "UUID Attribute for Groups:" : "UUID atribūti grupām:", " entries available within the provided Base DN" : "ieraksti pieejami ar nosacījumu DN bāzē", + "1. Server" : "1. Serveris", "LDAP" : "LDAP" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/user_ldap/l10n/lv.json b/apps/user_ldap/l10n/lv.json index 1d62f3c6a67..365cc6e421e 100644 --- a/apps/user_ldap/l10n/lv.json +++ b/apps/user_ldap/l10n/lv.json @@ -46,7 +46,6 @@ "Other Attributes:" : "Citi atribūti:", "Test Loginname" : "Pārbaudiet lietotājvārdu", "Verify settings" : "Pārbaudīt iestatījumus", - "1. Server" : "1. Serveris", "%s. Server:" : "%s. Serveris:", "Host" : "Resursdators", "Port" : "Ports", @@ -103,6 +102,7 @@ "UUID Attribute for Users:" : "UUID atribūti lietotājiem:", "UUID Attribute for Groups:" : "UUID atribūti grupām:", " entries available within the provided Base DN" : "ieraksti pieejami ar nosacījumu DN bāzē", + "1. Server" : "1. Serveris", "LDAP" : "LDAP" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/user_ldap/l10n/nb.js b/apps/user_ldap/l10n/nb.js index ee1e94ff59f..102953adb33 100644 --- a/apps/user_ldap/l10n/nb.js +++ b/apps/user_ldap/l10n/nb.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer et filter å legge til, når innlogging forsøkes. \"%%uid\" erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\"", "Test Loginname" : "Test påloggingsnavn", "Verify settings" : "Sjekk innstillinger", - "1. Server" : "1. Tjener", "%s. Server:" : "%s. tjener:", "Add a new configuration" : "Legger til nytt oppsett", "Copy current configuration into new directory binding" : "Kopier gjeldende konfigurasjon til ny katalogbinding", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Nullstill tilknytning av brukernavn til LDAP-bruker", "Clear Groupname-LDAP Group Mapping" : "Nullstill tilknytning av gruppenavn til LDAP-gruppe", " entries available within the provided Base DN" : "oppføringer tilgjengelig innenfor angitt base-DN", + "1. Server" : "1. Tjener", "Wrong password. Reset it?" : "Feilpassord. Tilbakestill?", "LDAP" : "LDAP", "<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>Advarsel:</b> Programmene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere én av dem.", diff --git a/apps/user_ldap/l10n/nb.json b/apps/user_ldap/l10n/nb.json index 9f953956ca3..427f4366fa6 100644 --- a/apps/user_ldap/l10n/nb.json +++ b/apps/user_ldap/l10n/nb.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer et filter å legge til, når innlogging forsøkes. \"%%uid\" erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\"", "Test Loginname" : "Test påloggingsnavn", "Verify settings" : "Sjekk innstillinger", - "1. Server" : "1. Tjener", "%s. Server:" : "%s. tjener:", "Add a new configuration" : "Legger til nytt oppsett", "Copy current configuration into new directory binding" : "Kopier gjeldende konfigurasjon til ny katalogbinding", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Nullstill tilknytning av brukernavn til LDAP-bruker", "Clear Groupname-LDAP Group Mapping" : "Nullstill tilknytning av gruppenavn til LDAP-gruppe", " entries available within the provided Base DN" : "oppføringer tilgjengelig innenfor angitt base-DN", + "1. Server" : "1. Tjener", "Wrong password. Reset it?" : "Feilpassord. Tilbakestill?", "LDAP" : "LDAP", "<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>Advarsel:</b> Programmene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere én av dem.", diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js index 166969c749b..f56b7d1501e 100644 --- a/apps/user_ldap/l10n/nl.js +++ b/apps/user_ldap/l10n/nl.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. \"%%uid\" vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"", "Test Loginname" : "Test inlognaam", "Verify settings" : "Verifiëren instellingen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Toevoegen nieuwe configuratie", "Copy current configuration into new directory binding" : "Kopieer de huidige configuratie naar een nieuwe directory binding", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling", "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling", " entries available within the provided Base DN" : "accounts beschikbaar binnen de provider Basis DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", "LDAP" : "LDAP", "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatibel. Je kunt onverwacht gedrag ervaren. Vraag je beheerder om een van beide apps de deactiveren.", diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json index 3a286b4bd0b..4a02a922ff4 100644 --- a/apps/user_ldap/l10n/nl.json +++ b/apps/user_ldap/l10n/nl.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. \"%%uid\" vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"", "Test Loginname" : "Test inlognaam", "Verify settings" : "Verifiëren instellingen", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Toevoegen nieuwe configuratie", "Copy current configuration into new directory binding" : "Kopieer de huidige configuratie naar een nieuwe directory binding", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling", "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling", " entries available within the provided Base DN" : "accounts beschikbaar binnen de provider Basis DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?", "LDAP" : "LDAP", "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatibel. Je kunt onverwacht gedrag ervaren. Vraag je beheerder om een van beide apps de deactiveren.", diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js index 1a23233a6ca..55a4f0ba49d 100644 --- a/apps/user_ldap/l10n/pl.js +++ b/apps/user_ldap/l10n/pl.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiuje filter do zastosowania podczas próby logowania. \"%%uid\" zastępuje nazwę użytkownika podczas logowania. Przykład: \"uid=%%uid\"", "Test Loginname" : "Testowa nazwa użytkownika", "Verify settings" : "Weryfikuj ustawienia", - "1. Server" : "1. Serwer", "%s. Server:" : "%s. Serwer:", "Add a new configuration" : "Dodaj nową konfigurację", "Copy current configuration into new directory binding" : "Kopiuje aktualną konfigurację do nowej lokalizacji", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Czyść Mapowanie użytkownika LDAP", "Clear Groupname-LDAP Group Mapping" : "Czyść Mapowanie nazwy grupy LDAP", " entries available within the provided Base DN" : "wpisów dostępnych w podanym Base DN ", + "1. Server" : "1. Serwer", "Wrong password. Reset it?" : "Nieprawidłowe hasło. Czy chcesz je zresetować?", "LDAP" : "LDAP", "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.", diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json index 1d17da22464..c350f399472 100644 --- a/apps/user_ldap/l10n/pl.json +++ b/apps/user_ldap/l10n/pl.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiuje filter do zastosowania podczas próby logowania. \"%%uid\" zastępuje nazwę użytkownika podczas logowania. Przykład: \"uid=%%uid\"", "Test Loginname" : "Testowa nazwa użytkownika", "Verify settings" : "Weryfikuj ustawienia", - "1. Server" : "1. Serwer", "%s. Server:" : "%s. Serwer:", "Add a new configuration" : "Dodaj nową konfigurację", "Copy current configuration into new directory binding" : "Kopiuje aktualną konfigurację do nowej lokalizacji", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Czyść Mapowanie użytkownika LDAP", "Clear Groupname-LDAP Group Mapping" : "Czyść Mapowanie nazwy grupy LDAP", " entries available within the provided Base DN" : "wpisów dostępnych w podanym Base DN ", + "1. Server" : "1. Serwer", "Wrong password. Reset it?" : "Nieprawidłowe hasło. Czy chcesz je zresetować?", "LDAP" : "LDAP", "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.", diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js index af4f828994a..0d23589538f 100644 --- a/apps/user_ldap/l10n/pt_BR.js +++ b/apps/user_ldap/l10n/pt_BR.js @@ -88,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar quando o login é tentado. \"%%uid\" substitui o nome de usuário durante o login. Por exemplo: \"uid=%%uid\"", "Test Loginname" : "Testar Loginname", "Verify settings" : "Verificar configurações", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Adiconar uma nova configuração", "Copy current configuration into new directory binding" : "Copie a configuração atual em um novo diretório vinculado", @@ -189,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Limpar Mapeamento de Usuário username-LDAP", "Clear Groupname-LDAP Group Mapping" : "Limpar Mapeamento do Grupo groupname-LDAP", " entries available within the provided Base DN" : "entradas disponíveis na Base DN fornecida", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Senha errada. Redefini-la?", "LDAP" : "LDAP", "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis e pode haver um comportamento inesperado. Por favor, peça ao administrador do sistema para desabilitar um deles.", diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json index b28e30e3b03..4bbecef6c25 100644 --- a/apps/user_ldap/l10n/pt_BR.json +++ b/apps/user_ldap/l10n/pt_BR.json @@ -86,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar quando o login é tentado. \"%%uid\" substitui o nome de usuário durante o login. Por exemplo: \"uid=%%uid\"", "Test Loginname" : "Testar Loginname", "Verify settings" : "Verificar configurações", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor:", "Add a new configuration" : "Adiconar uma nova configuração", "Copy current configuration into new directory binding" : "Copie a configuração atual em um novo diretório vinculado", @@ -187,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "Limpar Mapeamento de Usuário username-LDAP", "Clear Groupname-LDAP Group Mapping" : "Limpar Mapeamento do Grupo groupname-LDAP", " entries available within the provided Base DN" : "entradas disponíveis na Base DN fornecida", + "1. Server" : "1. Servidor", "Wrong password. Reset it?" : "Senha errada. Redefini-la?", "LDAP" : "LDAP", "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis e pode haver um comportamento inesperado. Por favor, peça ao administrador do sistema para desabilitar um deles.", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 50ea21e21e3..a58aa8d4795 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -59,7 +59,6 @@ OC.L10N.register( "Other Attributes:" : "Outros Atributos:", "Test Loginname" : "Testar nome de login", "Verify settings" : "Verificar definições", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor", "Copy current configuration into new directory binding" : "Copiar a configuração actual para um novo registo de conexão", "Delete the current configuration" : "Apagar a configuração actual", @@ -138,6 +137,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP", "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP", " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", + "1. Server" : "1. Servidor", "LDAP" : "LDAP", "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental." diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index 3290b05c237..7c1cb562c62 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -57,7 +57,6 @@ "Other Attributes:" : "Outros Atributos:", "Test Loginname" : "Testar nome de login", "Verify settings" : "Verificar definições", - "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servidor", "Copy current configuration into new directory binding" : "Copiar a configuração actual para um novo registo de conexão", "Delete the current configuration" : "Apagar a configuração actual", @@ -136,6 +135,7 @@ "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP", "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP", " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", + "1. Server" : "1. Servidor", "LDAP" : "LDAP", "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental." diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js index f1d07ba0e63..e2283b20f01 100644 --- a/apps/user_ldap/l10n/ru.js +++ b/apps/user_ldap/l10n/ru.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. «%% uid» заменяет имя пользователя для входа в систему. Например: \"uid=%%uid\"", "Test Loginname" : "Проверить логин", "Verify settings" : "Проверить настройки", - "1. Server" : "Сервер 1.", "%s. Server:" : "Сервер %s:", "Add a new configuration" : "Добавить новую конфигурацию", "Copy current configuration into new directory binding" : "Копировать текущую конфигурацию в новую связь с каталогом", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Очистить соответствия Имя-Пользователь LDAP", "Clear Groupname-LDAP Group Mapping" : "Очистить соответствия Группа-Группа LDAP", " entries available within the provided Base DN" : "элементов доступно в предоставленном базовом DN", + "1. Server" : "Сервер 1.", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", "LDAP" : "LDAP", "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json index 546e3022cff..429d15466d7 100644 --- a/apps/user_ldap/l10n/ru.json +++ b/apps/user_ldap/l10n/ru.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. «%% uid» заменяет имя пользователя для входа в систему. Например: \"uid=%%uid\"", "Test Loginname" : "Проверить логин", "Verify settings" : "Проверить настройки", - "1. Server" : "Сервер 1.", "%s. Server:" : "Сервер %s:", "Add a new configuration" : "Добавить новую конфигурацию", "Copy current configuration into new directory binding" : "Копировать текущую конфигурацию в новую связь с каталогом", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Очистить соответствия Имя-Пользователь LDAP", "Clear Groupname-LDAP Group Mapping" : "Очистить соответствия Группа-Группа LDAP", " entries available within the provided Base DN" : "элементов доступно в предоставленном базовом DN", + "1. Server" : "Сервер 1.", "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?", "LDAP" : "LDAP", "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.", diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js index 24a2082f189..4a23e64ef91 100644 --- a/apps/user_ldap/l10n/sk.js +++ b/apps/user_ldap/l10n/sk.js @@ -71,7 +71,6 @@ OC.L10N.register( "Other Attributes:" : "Iné atribúty:", "Test Loginname" : "Testovacie prihlasovacie meno", "Verify settings" : "Overiť nastavenia", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Pridať novú konfiguráciu", "Copy current configuration into new directory binding" : "Skopírovať súčasnú konfiguráciu do nového adresárového pripojenia", @@ -152,6 +151,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Zrušiť mapovanie LDAP používateľských mien", "Clear Groupname-LDAP Group Mapping" : "Zrušiť mapovanie názvov LDAP skupín", " entries available within the provided Base DN" : "dostupných záznamov v zadanej základnej DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "LDAP" : "LDAP", "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.", diff --git a/apps/user_ldap/l10n/sk.json b/apps/user_ldap/l10n/sk.json index 893c6316f4b..8e89b601079 100644 --- a/apps/user_ldap/l10n/sk.json +++ b/apps/user_ldap/l10n/sk.json @@ -69,7 +69,6 @@ "Other Attributes:" : "Iné atribúty:", "Test Loginname" : "Testovacie prihlasovacie meno", "Verify settings" : "Overiť nastavenia", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Pridať novú konfiguráciu", "Copy current configuration into new directory binding" : "Skopírovať súčasnú konfiguráciu do nového adresárového pripojenia", @@ -150,6 +149,7 @@ "Clear Username-LDAP User Mapping" : "Zrušiť mapovanie LDAP používateľských mien", "Clear Groupname-LDAP Group Mapping" : "Zrušiť mapovanie názvov LDAP skupín", " entries available within the provided Base DN" : "dostupných záznamov v zadanej základnej DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?", "LDAP" : "LDAP", "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index e71f12a2a24..5a1168af449 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -61,7 +61,6 @@ OC.L10N.register( "Other Attributes:" : "Drugi atributi:", "Test Loginname" : "Preizkusi prijavno ime", "Verify settings" : "Preveri nastavitve", - "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", "Delete the current configuration" : "Izbriši trenutne nastavitve", @@ -137,6 +136,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP", "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP", " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "1. Server" : "1. strežnik", "LDAP" : "LDAP", "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti." }, diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 031d4298ad8..50c6dded16b 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -59,7 +59,6 @@ "Other Attributes:" : "Drugi atributi:", "Test Loginname" : "Preizkusi prijavno ime", "Verify settings" : "Preveri nastavitve", - "1. Server" : "1. strežnik", "%s. Server:" : "%s. strežnik:", "Copy current configuration into new directory binding" : "Kopiraj trenutne nastavitve v vezi nove mape.", "Delete the current configuration" : "Izbriši trenutne nastavitve", @@ -135,6 +134,7 @@ "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP", "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP", " entries available within the provided Base DN" : "vnosi, ki so na voljo znotraj razpoložljivega osnovnega enoznačnega imena (Base DN)", + "1. Server" : "1. strežnik", "LDAP" : "LDAP", "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti." },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);" diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js index f6dde47e473..f82787b239c 100644 --- a/apps/user_ldap/l10n/sq.js +++ b/apps/user_ldap/l10n/sq.js @@ -82,7 +82,6 @@ OC.L10N.register( "Other Attributes:" : "Atribute të Tjerë:", "Test Loginname" : "Testo Emër hyrjesh", "Verify settings" : "Verifikoni rregullimet", - "1. Server" : "1. Shërbyes", "%s. Server:" : "%s. Shërbyes:", "Add a new configuration" : "Shto një konfigurim të ri", "Copy current configuration into new directory binding" : "Kopjojeni formësimin e tanishëm te një lidhmë e re drejtorie", @@ -181,6 +180,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Pastro Përshoqërimin Emër përdoruesi-Përdorues LDAP", "Clear Groupname-LDAP Group Mapping" : "Pastro Përshoqërimin Emër grupi-Grup LDAP", " entries available within the provided Base DN" : " zëra të gatshëm brenda DN-së Bazë të dhënë", + "1. Server" : "1. Shërbyes", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Do ta rivendosësh?", "LDAP" : "LDAP", "<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>Kujdes:</b> user_ldap dhe user_webdavauth të aplikacionit janë të papërputhshëm. Mund t’ju ndodhin sjellje të papritura. Ju lutemi, kërkojini përgjegjësit të sistemit tuaj të çaktivizojë një prej tyre.", diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json index 65d1ae5ea3b..3d4d1e9d7f8 100644 --- a/apps/user_ldap/l10n/sq.json +++ b/apps/user_ldap/l10n/sq.json @@ -80,7 +80,6 @@ "Other Attributes:" : "Atribute të Tjerë:", "Test Loginname" : "Testo Emër hyrjesh", "Verify settings" : "Verifikoni rregullimet", - "1. Server" : "1. Shërbyes", "%s. Server:" : "%s. Shërbyes:", "Add a new configuration" : "Shto një konfigurim të ri", "Copy current configuration into new directory binding" : "Kopjojeni formësimin e tanishëm te një lidhmë e re drejtorie", @@ -179,6 +178,7 @@ "Clear Username-LDAP User Mapping" : "Pastro Përshoqërimin Emër përdoruesi-Përdorues LDAP", "Clear Groupname-LDAP Group Mapping" : "Pastro Përshoqërimin Emër grupi-Grup LDAP", " entries available within the provided Base DN" : " zëra të gatshëm brenda DN-së Bazë të dhënë", + "1. Server" : "1. Shërbyes", "Wrong password. Reset it?" : "Fjalëkalim i gabuar. Do ta rivendosësh?", "LDAP" : "LDAP", "<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>Kujdes:</b> user_ldap dhe user_webdavauth të aplikacionit janë të papërputhshëm. Mund t’ju ndodhin sjellje të papritura. Ju lutemi, kërkojini përgjegjësit të sistemit tuaj të çaktivizojë një prej tyre.", diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js index 390f07a9346..e38a664d54e 100644 --- a/apps/user_ldap/l10n/sr.js +++ b/apps/user_ldap/l10n/sr.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Дефинише филтер који ће се применити, када се покуша пријава. \"%%uid\" замењује корисничко име у пријави. Example: \"uid=%%uid\"", "Test Loginname" : "Испробај име за пријаву", "Verify settings" : "Провери поставке", - "1. Server" : "1. сервер", "%s. Server:" : "%s. Сервер:", "Add a new configuration" : "Додај нову поставку", "Copy current configuration into new directory binding" : "Копирај тренутну поставу у везивање новог директоријума", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Очисти Username-LDAP мапирање корисника", "Clear Groupname-LDAP Group Mapping" : "Очисти Groupname-LDAP мапирање група", " entries available within the provided Base DN" : "уноса доступно за дати базни ДН", + "1. Server" : "1. сервер", "Wrong password. Reset it?" : "Погрешна лозинка. Желите ли да је ресетујете?", "LDAP" : "LDAP", "<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>Упозорење:</b> Апликације user_ldap и user_webdavauth нису компатибилне. Можете имати проблема. Питајте систем администратора да искључи једну од њих.", diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json index 9423ba4424a..23c087f3ca2 100644 --- a/apps/user_ldap/l10n/sr.json +++ b/apps/user_ldap/l10n/sr.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Дефинише филтер који ће се применити, када се покуша пријава. \"%%uid\" замењује корисничко име у пријави. Example: \"uid=%%uid\"", "Test Loginname" : "Испробај име за пријаву", "Verify settings" : "Провери поставке", - "1. Server" : "1. сервер", "%s. Server:" : "%s. Сервер:", "Add a new configuration" : "Додај нову поставку", "Copy current configuration into new directory binding" : "Копирај тренутну поставу у везивање новог директоријума", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "Очисти Username-LDAP мапирање корисника", "Clear Groupname-LDAP Group Mapping" : "Очисти Groupname-LDAP мапирање група", " entries available within the provided Base DN" : "уноса доступно за дати базни ДН", + "1. Server" : "1. сервер", "Wrong password. Reset it?" : "Погрешна лозинка. Желите ли да је ресетујете?", "LDAP" : "LDAP", "<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>Упозорење:</b> Апликације user_ldap и user_webdavauth нису компатибилне. Можете имати проблема. Питајте систем администратора да искључи једну од њих.", diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js index e0c1c5297b9..7168700783c 100644 --- a/apps/user_ldap/l10n/sv.js +++ b/apps/user_ldap/l10n/sv.js @@ -85,7 +85,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filtret som ska appliceras vid inloggningsförsök. \"%%uid\" ersätter användarnamnet i inloggningshändelsen. Exempel: \"uid=%%uid\"", "Test Loginname" : "Testa inloggningsnamn", "Verify settings" : "Verifiera inställningar", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Lägg till en ny konfiguration", "Copy current configuration into new directory binding" : "Kopiera nuvarande konfiguration till en ny katalogsammansättning", @@ -185,6 +184,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Rensa användarnamn-LDAP användarmappning", "Clear Groupname-LDAP Group Mapping" : "Rensa gruppnamn-LDAP gruppmappning", " entries available within the provided Base DN" : "Poster tillgängliga inom angivet Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Fel lösenord. Återställa det?", "LDAP" : "LDAP", "<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 dem.", diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json index 4582aa0c1fc..032002bc946 100644 --- a/apps/user_ldap/l10n/sv.json +++ b/apps/user_ldap/l10n/sv.json @@ -83,7 +83,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filtret som ska appliceras vid inloggningsförsök. \"%%uid\" ersätter användarnamnet i inloggningshändelsen. Exempel: \"uid=%%uid\"", "Test Loginname" : "Testa inloggningsnamn", "Verify settings" : "Verifiera inställningar", - "1. Server" : "1. Server", "%s. Server:" : "%s. Server:", "Add a new configuration" : "Lägg till en ny konfiguration", "Copy current configuration into new directory binding" : "Kopiera nuvarande konfiguration till en ny katalogsammansättning", @@ -183,6 +182,7 @@ "Clear Username-LDAP User Mapping" : "Rensa användarnamn-LDAP användarmappning", "Clear Groupname-LDAP Group Mapping" : "Rensa gruppnamn-LDAP gruppmappning", " entries available within the provided Base DN" : "Poster tillgängliga inom angivet Base DN", + "1. Server" : "1. Server", "Wrong password. Reset it?" : "Fel lösenord. Återställa det?", "LDAP" : "LDAP", "<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 dem.", diff --git a/apps/user_ldap/l10n/th.js b/apps/user_ldap/l10n/th.js index 2bed9dd1d3e..89060018f1e 100644 --- a/apps/user_ldap/l10n/th.js +++ b/apps/user_ldap/l10n/th.js @@ -59,7 +59,6 @@ OC.L10N.register( "Other Attributes:" : "คุณลักษณะอื่นๆ:", "Test Loginname" : "ทดสอบชื่อที่ใช้ในการเข้าสู่ระบบ", "Verify settings" : "ตรวจสอบการตั้งค่า", - "1. Server" : "1. เซิร์ฟเวอร์", "%s. Server:" : "เซิร์ฟเวอร์%s", "Copy current configuration into new directory binding" : "คัดลอกการตั้งค่าปัจจุบันลงในไดเรกทอรีใหม่ที่ผูกกัน", "Delete the current configuration" : "ลบการตั้งค่าปัจจุบัน", @@ -135,6 +134,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "ล้าง Username-LDAP ผู้ใช้ Mapping", "Clear Groupname-LDAP Group Mapping" : "ล้าง Groupname-LDAP กลุ่ม Mapping", " entries available within the provided Base DN" : "รายการที่มีอยู่ใน Base DN", + "1. Server" : "1. เซิร์ฟเวอร์", "LDAP" : "LDAP", "<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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ชื่อผู้ใช้จะใช้ในการจัดเก็บและกำหนดข้อมูล (เมตา) เพื่อรู้จักกับผู้ใช้และสามารถระบุได้อย่างแม่นยำ แต่ละ LDAP จะมีชื่อผู้ใช้ภายใน จึงต้องทำ Mapping ให้กับผู้ใช้ LDAP ชื่อผู้ใช้ที่ถูกสร้างขึ้นจะถูกแมปเข้ากับ UUID ของผู้ใช้ LDAP นอกจากนี้ DN ก็จะถูกแคชเช่นกันเพื่อลดการทำงานร่วมกันของ LDAP แต่มันก็ไม่ได้ใช้เพื่อระบุตัวตน หากมีการเปลี่ยนแปลง DN การเปลี่ยนแปลงจะถูกพบในทันที ชื่อผู้ใช้ภายในจะถูกใช้กับทั้งหมด การล้างแมปไม่มีผลต่อการกำหนดค่า LDAP ทั้งหมด! \nและจะเกิดขึ้นเฉพาะในการทดสอบหรือขั้นตอนการทดลอง" diff --git a/apps/user_ldap/l10n/th.json b/apps/user_ldap/l10n/th.json index c778345a012..fbefe45ce42 100644 --- a/apps/user_ldap/l10n/th.json +++ b/apps/user_ldap/l10n/th.json @@ -57,7 +57,6 @@ "Other Attributes:" : "คุณลักษณะอื่นๆ:", "Test Loginname" : "ทดสอบชื่อที่ใช้ในการเข้าสู่ระบบ", "Verify settings" : "ตรวจสอบการตั้งค่า", - "1. Server" : "1. เซิร์ฟเวอร์", "%s. Server:" : "เซิร์ฟเวอร์%s", "Copy current configuration into new directory binding" : "คัดลอกการตั้งค่าปัจจุบันลงในไดเรกทอรีใหม่ที่ผูกกัน", "Delete the current configuration" : "ลบการตั้งค่าปัจจุบัน", @@ -133,6 +132,7 @@ "Clear Username-LDAP User Mapping" : "ล้าง Username-LDAP ผู้ใช้ Mapping", "Clear Groupname-LDAP Group Mapping" : "ล้าง Groupname-LDAP กลุ่ม Mapping", " entries available within the provided Base DN" : "รายการที่มีอยู่ใน Base DN", + "1. Server" : "1. เซิร์ฟเวอร์", "LDAP" : "LDAP", "<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>คำเตือน:</b> แอพฯ user_ldap และ user_webdavauth เข้ากันไม่ได้ คุณอาจจะพบเหตุการณ์ที่ไม่คาดคิด กรุณาขอให้ผู้ดูแลระบบของคุณปิดการใช้งานบางอย่างของพวกเขา", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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." : "ชื่อผู้ใช้จะใช้ในการจัดเก็บและกำหนดข้อมูล (เมตา) เพื่อรู้จักกับผู้ใช้และสามารถระบุได้อย่างแม่นยำ แต่ละ LDAP จะมีชื่อผู้ใช้ภายใน จึงต้องทำ Mapping ให้กับผู้ใช้ LDAP ชื่อผู้ใช้ที่ถูกสร้างขึ้นจะถูกแมปเข้ากับ UUID ของผู้ใช้ LDAP นอกจากนี้ DN ก็จะถูกแคชเช่นกันเพื่อลดการทำงานร่วมกันของ LDAP แต่มันก็ไม่ได้ใช้เพื่อระบุตัวตน หากมีการเปลี่ยนแปลง DN การเปลี่ยนแปลงจะถูกพบในทันที ชื่อผู้ใช้ภายในจะถูกใช้กับทั้งหมด การล้างแมปไม่มีผลต่อการกำหนดค่า LDAP ทั้งหมด! \nและจะเกิดขึ้นเฉพาะในการทดสอบหรือขั้นตอนการทดลอง" diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js index f8bc10cf97b..dd6baca7467 100644 --- a/apps/user_ldap/l10n/tr.js +++ b/apps/user_ldap/l10n/tr.js @@ -88,7 +88,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişiminde uygulanacak süzgeci tanımlar. Oturum açma işleminde \"%%uid\" kullanıcı adı ile değiştirilir. Örnek: \"uid=%%uid\"", "Test Loginname" : "Kullanıcı adını sına", "Verify settings" : "Ayarları doğrula", - "1. Server" : "1. Sunucu", "%s. Server:" : "%s. Sunucu:", "Add a new configuration" : "Yeni bir yapılandırma ekle", "Copy current configuration into new directory binding" : "Geçerli yapılandırmayı yeni dizin bağlamasına kopyala", @@ -189,6 +188,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Kaldır", "Clear Groupname-LDAP Group Mapping" : "Grup Adı-LDAP Grubu Eşleştirmesini Kaldır", " entries available within the provided Base DN" : "kayıt belirtilen Base DN üzerinde var", + "1. Server" : "1. Sunucu", "Wrong password. Reset it?" : "Parola yanlış. Sıfırlamak ister misiniz?", "LDAP" : "LDAP", "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle görüşün.", diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json index ddbda523064..5e26c9c7a6e 100644 --- a/apps/user_ldap/l10n/tr.json +++ b/apps/user_ldap/l10n/tr.json @@ -86,7 +86,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişiminde uygulanacak süzgeci tanımlar. Oturum açma işleminde \"%%uid\" kullanıcı adı ile değiştirilir. Örnek: \"uid=%%uid\"", "Test Loginname" : "Kullanıcı adını sına", "Verify settings" : "Ayarları doğrula", - "1. Server" : "1. Sunucu", "%s. Server:" : "%s. Sunucu:", "Add a new configuration" : "Yeni bir yapılandırma ekle", "Copy current configuration into new directory binding" : "Geçerli yapılandırmayı yeni dizin bağlamasına kopyala", @@ -187,6 +186,7 @@ "Clear Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Kaldır", "Clear Groupname-LDAP Group Mapping" : "Grup Adı-LDAP Grubu Eşleştirmesini Kaldır", " entries available within the provided Base DN" : "kayıt belirtilen Base DN üzerinde var", + "1. Server" : "1. Sunucu", "Wrong password. Reset it?" : "Parola yanlış. Sıfırlamak ister misiniz?", "LDAP" : "LDAP", "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle görüşün.", diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js index 8570421137c..3b856f262d0 100644 --- a/apps/user_ldap/l10n/uk.js +++ b/apps/user_ldap/l10n/uk.js @@ -36,7 +36,6 @@ OC.L10N.register( "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.", "LDAP / AD Email Address:" : "LDAP / AD Email адреса:", "Other Attributes:" : "Інші Атрибути:", - "1. Server" : "1. Сервер", "%s. Server:" : "%s. Сервер:", "Host" : "Хост", "Port" : "Порт", @@ -103,6 +102,7 @@ OC.L10N.register( "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ", "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP", "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP", + "1. Server" : "1. Сервер", "LDAP" : "LDAP", "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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 використовує імена користувачів для зберігання та призначення метаданих. Для точної ідентифікації та розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатором UUID користувача LDAP. Крім цього кешируєтся доменне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо доменне ім'я було змінено, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується повсюдно в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язане до конфігурації, воно вплине на всі LDAP підключення! Ні в якому разі не рекомендується скидати прив'язки якщо система вже знаходиться в експлуатації, тільки на етапі тестування." diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json index 8cbef74a159..5959d781976 100644 --- a/apps/user_ldap/l10n/uk.json +++ b/apps/user_ldap/l10n/uk.json @@ -34,7 +34,6 @@ "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.", "LDAP / AD Email Address:" : "LDAP / AD Email адреса:", "Other Attributes:" : "Інші Атрибути:", - "1. Server" : "1. Сервер", "%s. Server:" : "%s. Сервер:", "Host" : "Хост", "Port" : "Порт", @@ -101,6 +100,7 @@ "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ", "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP", "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP", + "1. Server" : "1. Сервер", "LDAP" : "LDAP", "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.", "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an 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 використовує імена користувачів для зберігання та призначення метаданих. Для точної ідентифікації та розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатором UUID користувача LDAP. Крім цього кешируєтся доменне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо доменне ім'я було змінено, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується повсюдно в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язане до конфігурації, воно вплине на всі LDAP підключення! Ні в якому разі не рекомендується скидати прив'язки якщо система вже знаходиться в експлуатації, тільки на етапі тестування." diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js index ab2824647aa..af1ac87373e 100644 --- a/apps/user_ldap/l10n/zh_CN.js +++ b/apps/user_ldap/l10n/zh_CN.js @@ -86,7 +86,6 @@ OC.L10N.register( "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "定义登录时采用的过滤规则。登录时用 \"%%uid\" 替换用户名。例如：\"uid=%%uid\"", "Test Loginname" : "测试登录名", "Verify settings" : "验证设置", - "1. Server" : "1.服务器", "%s. Server:" : "%s.服务器", "Add a new configuration" : "增加一个新的配置", "Copy current configuration into new directory binding" : "当前配置复制到新目录", @@ -187,6 +186,7 @@ OC.L10N.register( "Clear Username-LDAP User Mapping" : "清除用户-LDAP用户映射", "Clear Groupname-LDAP Group Mapping" : "清除组用户-LDAP级映射", " entries available within the provided Base DN" : "基础DN中的可用条目", + "1. Server" : "1.服务器", "Wrong password. Reset it?" : "密码错误。是否重置？", "LDAP" : "LDAP", "<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>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。", diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json index 1d85c88eed4..7a6f79a7212 100644 --- a/apps/user_ldap/l10n/zh_CN.json +++ b/apps/user_ldap/l10n/zh_CN.json @@ -84,7 +84,6 @@ "Defines the filter to apply, when login is attempted. \"%%uid\" replaces the username in the login action. Example: \"uid=%%uid\"" : "定义登录时采用的过滤规则。登录时用 \"%%uid\" 替换用户名。例如：\"uid=%%uid\"", "Test Loginname" : "测试登录名", "Verify settings" : "验证设置", - "1. Server" : "1.服务器", "%s. Server:" : "%s.服务器", "Add a new configuration" : "增加一个新的配置", "Copy current configuration into new directory binding" : "当前配置复制到新目录", @@ -185,6 +184,7 @@ "Clear Username-LDAP User Mapping" : "清除用户-LDAP用户映射", "Clear Groupname-LDAP Group Mapping" : "清除组用户-LDAP级映射", " entries available within the provided Base DN" : "基础DN中的可用条目", + "1. Server" : "1.服务器", "Wrong password. Reset it?" : "密码错误。是否重置？", "LDAP" : "LDAP", "<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>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。", diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js index 0f4118c24d7..28cb0502f69 100644 --- a/apps/user_ldap/l10n/zh_TW.js +++ b/apps/user_ldap/l10n/zh_TW.js @@ -36,6 +36,7 @@ OC.L10N.register( "A connection error to LDAP / AD occurred, please check host, port and credentials." : "連線到 LDAP/AD出現錯誤，請檢查主機，連接阜和驗證資訊", "Please provide a login name to test against" : "請提供登入姓名以便再次測試", "The group box was disabled, because the LDAP / AD server does not support memberOf." : "群組盒已經停用，LDAP/AD 伺服器並不支援", + "LDAP / AD integration" : "LDAP /AD 整合", "_%s group found_::_%s groups found_" : ["找到 %s 群組"], "_%s user found_::_%s users found_" : ["找到 %s 使用者"], "Could not find the desired feature" : "無法找到所需的功能", @@ -54,7 +55,6 @@ OC.L10N.register( "Other Attributes:" : "其他屬性:", "Test Loginname" : "測試登入姓名", "Verify settings" : "驗證設定", - "1. Server" : "1. 伺服器", "%s. Server:" : "%s. 伺服器:", "Copy current configuration into new directory binding" : "複製目前的設定檔到新目錄", "Delete the current configuration" : "刪除目前的設定檔", @@ -116,6 +116,7 @@ OC.L10N.register( "Override UUID detection" : "偵測覆寫UUID", "UUID Attribute for Users:" : "使用者的UUID值:", "UUID Attribute for Groups:" : "群組的UUID值:", + "1. Server" : "1. 伺服器", "LDAP" : "LDAP", "<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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。" }, diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json index b43aec23cd3..d6408ae5493 100644 --- a/apps/user_ldap/l10n/zh_TW.json +++ b/apps/user_ldap/l10n/zh_TW.json @@ -34,6 +34,7 @@ "A connection error to LDAP / AD occurred, please check host, port and credentials." : "連線到 LDAP/AD出現錯誤，請檢查主機，連接阜和驗證資訊", "Please provide a login name to test against" : "請提供登入姓名以便再次測試", "The group box was disabled, because the LDAP / AD server does not support memberOf." : "群組盒已經停用，LDAP/AD 伺服器並不支援", + "LDAP / AD integration" : "LDAP /AD 整合", "_%s group found_::_%s groups found_" : ["找到 %s 群組"], "_%s user found_::_%s users found_" : ["找到 %s 使用者"], "Could not find the desired feature" : "無法找到所需的功能", @@ -52,7 +53,6 @@ "Other Attributes:" : "其他屬性:", "Test Loginname" : "測試登入姓名", "Verify settings" : "驗證設定", - "1. Server" : "1. 伺服器", "%s. Server:" : "%s. 伺服器:", "Copy current configuration into new directory binding" : "複製目前的設定檔到新目錄", "Delete the current configuration" : "刪除目前的設定檔", @@ -114,6 +114,7 @@ "Override UUID detection" : "偵測覆寫UUID", "UUID Attribute for Users:" : "使用者的UUID值:", "UUID Attribute for Groups:" : "群組的UUID值:", + "1. Server" : "1. 伺服器", "LDAP" : "LDAP", "<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>警告:</b> 應用程式user_ldap和user_webdavauth互不相容。可能會造成無法預期的結果。請要求您的系統管理員將兩者其中之一停用。" },"pluralForm" :"nplurals=1; plural=0;" diff --git a/apps/user_ldap/lib/Settings/Admin.php b/apps/user_ldap/lib/Settings/Admin.php index 33a86ad72d2..bf5bbef2f90 100644 --- a/apps/user_ldap/lib/Settings/Admin.php +++ b/apps/user_ldap/lib/Settings/Admin.php @@ -49,6 +49,14 @@ class Admin implements ISettings { public function getForm() { $helper = new Helper(\OC::$server->getConfig()); $prefixes = $helper->getServerConfigurationPrefixes(); + if(count($prefixes) === 0) { + $newPrefix = $helper->getNextServerConfigurationPrefix(); + $config = new Configuration($newPrefix, false); + $config->setConfiguration($config->getDefaults()); + $config->saveConfiguration(); + $prefixes[] = $newPrefix; + } + $hosts = $helper->getServerConfigurationHosts(); $wControls = new Template('user_ldap', 'part.wizardcontrols'); @@ -62,7 +70,9 @@ class Admin implements ISettings { $parameters['wizardControls'] = $wControls; // assign default values - $config = new Configuration('', false); + if(!isset($config)) { + $config = new Configuration('', false); + } $defaults = $config->getDefaults(); foreach($defaults as $key => $default) { $parameters[$key.'_default'] = $default; diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php index 9803fb3cd3c..5b607f7be86 100644 --- a/apps/user_ldap/templates/part.wizard-server.php +++ b/apps/user_ldap/templates/part.wizard-server.php @@ -1,18 +1,13 @@ <fieldset id="ldapWizard1"> <p> <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser"> - <?php if(count($_['serverConfigurationPrefixes']) === 0 ) { + <?php + $i = 1; + $sel = ' selected'; + foreach($_['serverConfigurationPrefixes'] as $prefix) { ?> - <option value="" selected><?php p($l->t('1. Server'));?></option>'); + <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> <?php - } else { - $i = 1; - $sel = ' selected'; - foreach($_['serverConfigurationPrefixes'] as $prefix) { - ?> - <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> - <?php - } } ?> </select> diff --git a/apps/user_ldap/tests/Settings/AdminTest.php b/apps/user_ldap/tests/Settings/AdminTest.php index 8161896e719..84004b9d465 100644 --- a/apps/user_ldap/tests/Settings/AdminTest.php +++ b/apps/user_ldap/tests/Settings/AdminTest.php @@ -56,10 +56,8 @@ class AdminTest extends TestCase { * @UseDB */ public function testGetForm() { - - $helper = new Helper(\OC::$server->getConfig()); - $prefixes = $helper->getServerConfigurationPrefixes(); - $hosts = $helper->getServerConfigurationHosts(); + $prefixes = ['s01']; + $hosts = ['s01' => '']; $wControls = new Template('user_ldap', 'part.wizardcontrols'); $wControls = $wControls->fetchPage(); diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php index fe4a83bb906..bd94ec9d5bc 100644 --- a/apps/workflowengine/lib/Check/FileMimeType.php +++ b/apps/workflowengine/lib/Check/FileMimeType.php @@ -83,9 +83,13 @@ class FileMimeType extends AbstractStringCheck { return $this->mimeType[$this->storage->getId()][$this->path]; } - if ($this->request->getMethod() === 'PUT') { - $path = $this->request->getPathInfo(); - $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path); + if ($this->request->getMethod() === 'PUT' || $this->request->getMethod() === 'MOVE') { + if ($this->request->getMethod() === 'MOVE') { + $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($this->path); + } else { + $path = $this->request->getPathInfo(); + $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path); + } return $this->mimeType[$this->storage->getId()][$this->path]; } } else if ($this->isPublicWebDAVRequest()) { @@ -171,7 +175,9 @@ class FileMimeType extends AbstractStringCheck { $this->request->getPathInfo() === '/webdav' || strpos($this->request->getPathInfo(), '/webdav/') === 0 || $this->request->getPathInfo() === '/dav/files' || - strpos($this->request->getPathInfo(), '/dav/files/') === 0 + strpos($this->request->getPathInfo(), '/dav/files/') === 0 || + $this->request->getPathInfo() === '/dav/uploads' || + strpos($this->request->getPathInfo(), '/dav/uploads/') === 0 ); } diff --git a/core/css/apps.scss b/core/css/apps.scss index 1120459230a..92fec46c99d 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -369,7 +369,7 @@ kbd { margin: 0; padding: 0; background: none; - background-image: url('../img/actions/triangle-s.svg?v=1'); + @include icon-color('triangle-s', 'actions', $color-black, 1, true); background-size: 16px; background-repeat: no-repeat; background-position: center; diff --git a/core/css/guest.css b/core/css/guest.css index 512fd6c9d40..fc926688c44 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -77,6 +77,8 @@ body { min-height: 128px; max-height: 200px; margin: 0 auto; + position: relative; + left: unset; } #header .logo img { @@ -744,7 +746,7 @@ footer { margin-top: auto; } -footer .info a { +footer .info .entity-name { font-weight: 600; } diff --git a/core/css/header.scss b/core/css/header.scss index 52a179cc5cb..3b3a87ec714 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -56,10 +56,15 @@ /* LOGO and APP NAME -------------------------------------------------------- */ #nextcloud { - padding: 8px 12px; + padding: 7px 0; + padding-left: 86px; // logo width + 2* pa + position: relative; height: 100%; box-sizing: border-box; opacity: 1; + display: flex; + align-items: center; + flex-wrap: wrap; &:focus { opacity: .75; } @@ -107,12 +112,10 @@ background-repeat: no-repeat; background-size: contain; background-position: center; - width: 256px; - height: 128px; - margin: 0 auto; - &.logo-icon { - width: 62px; - height: 34px; + width: 62px; + height: 100%; + position: absolute; + left: 12px; img { opacity: 0; @@ -121,10 +124,8 @@ } } - } .header-appname-container { display: none; - padding-top: 22px; padding-right: 10px; flex-shrink: 0; } @@ -153,7 +154,6 @@ #header-right, .header-right { justify-content: flex-end; - flex-basis: 210px; flex-shrink: 1; } @@ -207,15 +207,12 @@ /* show appname next to logo */ .header-appname { - display: inline-block; - position: relative; color: var(--color-primary-text); font-size: 16px; font-weight: 300; margin: 0; - margin-top: -26px; - padding: 7px 0 7px 5px; - vertical-align: middle; + padding: 0; + padding-right: 5px; } /* do not show menu toggle on public share links as there is no menu */ @@ -577,7 +574,8 @@ nav[role='navigation'] { background: var(--color-primary) !important; &.skip-content { - left: 253px; + left: $navigation-width; + margin-left: 3px; } &:focus, diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 925069917e0..365a7c9c426 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -469,7 +469,7 @@ input { white-space: nowrap; text-overflow: ellipsis; background: var(--color-main-background); - color: var(--color-text-lighter); + color: var(--color-text-lighter) !important; box-sizing: content-box; border-radius: var(--border-radius); border: 1px solid var(--color-border-dark); @@ -514,7 +514,7 @@ input { white-space: nowrap; text-overflow: ellipsis; background: var(--color-main-background); - color: var(--color-text-lighter); + color: var(--color-text-lighter) !important; box-sizing: content-box; border-radius: var(--border-radius); border: 1px solid var(--color-border-dark); diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 1b067c9527f..6f061abc75c 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -132,7 +132,8 @@ } @media only screen and (max-width: 480px) { - #header .header-right .menu { + #header .header-left > nav > .menu, + #header .header-right > div > .menu { max-width: calc(100vw - 10px); position: fixed; &::after { @@ -165,4 +166,9 @@ right: 27px; } } + + #notification-container { + max-width: 100%; + width: 100%; + } } diff --git a/core/css/public.scss b/core/css/public.scss index cac98f23f92..5f02dc1762b 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -7,15 +7,6 @@ $footer-height: 65px; color: var(--color-primary-text); } - .menutoggle, - #header-primary-action[class^='icon-'] { - padding: 14px; - padding-right: 40px; - background-position: right 15px center; - color: var(--color-primary-text); - cursor: pointer; - } - #header-secondary-action { margin-right: 13px; diff --git a/core/css/styles.scss b/core/css/styles.scss index 6a72df0e177..2d6df4c3932 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -399,16 +399,17 @@ td.avatar { } #notification-container { + left: 50%; + max-width: 60%; position: fixed; top: 0; - width: 100%; text-align: center; + transform: translateX(-50%); z-index: 8000; } #notification { margin: 0 auto; - max-width: 60%; z-index: 8000; background-color: var(--color-main-background); border: 0; diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 7384804c9d4..a821a41cc86 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -141,5 +141,6 @@ img.width = size; img.height = size; img.src = url; + img.alt = ''; }; }(jQuery)); diff --git a/core/js/js.js b/core/js/js.js index a4de1c3dbf6..8e7796143d5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1571,7 +1571,7 @@ function initCore() { var resizeMenu = function() { var appList = $('#appmenu li'); - var headerWidth = $('.header-left').width() - $('#nextcloud').width(); + var headerWidth = $('.header-left').outerWidth() - $('#nextcloud').outerWidth(); var usePercentualAppMenuLimit = 0.33; var minAppsDesktop = 8; var availableWidth = headerWidth - $(appList).width(); diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index 9fa1847d3d5..da4d887634a 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -25,8 +25,8 @@ ' <span class="shareWithConfirm icon icon-confirm"></span>' + '</div>' + '{{/if}}' + - '<div class="shareeListView subView"></div>' + '<div class="linkShareView subView"></div>' + + '<div class="shareeListView subView"></div>' + '<div class="loading hidden" style="height: 50px"></div>'; /** @@ -159,13 +159,16 @@ }, function (result) { if (result.ocs.meta.statuscode === 100) { - var filter = function(users, groups, remotes, remote_groups, emails, circles) { + var filter = function(users, groups, remotes, remote_groups, emails, circles, rooms) { if (typeof(emails) === 'undefined') { emails = []; } if (typeof(circles) === 'undefined') { circles = []; } + if (typeof(rooms) === 'undefined') { + rooms = []; + } var usersLength; var groupsLength; @@ -173,6 +176,7 @@ var remoteGroupsLength; var emailsLength; var circlesLength; + var roomsLength; var i, j; @@ -251,6 +255,14 @@ break; } } + } else if (share.share_type === OC.Share.SHARE_TYPE_ROOM) { + roomsLength = rooms.length; + for (j = 0; j < roomsLength; j++) { + if (rooms[j].value.shareWith === share.share_with) { + rooms.splice(j, 1); + break; + } + } } } }; @@ -261,7 +273,8 @@ result.ocs.data.exact.remotes, result.ocs.data.exact.remote_groups, result.ocs.data.exact.emails, - result.ocs.data.exact.circles + result.ocs.data.exact.circles, + result.ocs.data.exact.rooms ); var exactUsers = result.ocs.data.exact.users; @@ -276,8 +289,12 @@ if (typeof(result.ocs.data.circles) !== 'undefined') { exactCircles = result.ocs.data.exact.circles; } + var exactRooms = []; + if (typeof(result.ocs.data.rooms) !== 'undefined') { + exactRooms = result.ocs.data.exact.rooms; + } - var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles); + var exactMatches = exactUsers.concat(exactGroups).concat(exactRemotes).concat(exactRemoteGroups).concat(exactEmails).concat(exactCircles).concat(exactRooms); filter( result.ocs.data.users, @@ -285,7 +302,8 @@ result.ocs.data.remotes, result.ocs.data.remote_groups, result.ocs.data.emails, - result.ocs.data.circles + result.ocs.data.circles, + result.ocs.data.rooms ); var users = result.ocs.data.users; @@ -301,8 +319,12 @@ if (typeof(result.ocs.data.circles) !== 'undefined') { circles = result.ocs.data.circles; } + var rooms = []; + if (typeof(result.ocs.data.rooms) !== 'undefined') { + rooms = result.ocs.data.rooms; + } - var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(lookup); + var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup); deferred.resolve(suggestions, exactMatches); } else { @@ -432,6 +454,8 @@ text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false }); } else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) { text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false}); + } else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) { + text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false }); } var insert = $("<div class='share-autocomplete-item'/>"); var avatar = $("<div class='avatardiv'></div>").appendTo(insert); diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js index 33d3be51440..20504c56b67 100644 --- a/core/js/tests/specs/sharedialogviewSpec.js +++ b/core/js/tests/specs/sharedialogviewSpec.js @@ -303,7 +303,7 @@ describe('OC.Share.ShareDialogView', function() { }); it('test avatar for circle', function() { - var avatarElement = dialog.$('.avatar').eq(4); + var avatarElement = dialog.$('.avatar').eq(5); expect(avatarElement.css('background')).toContain('path/to/the/avatar'); }); diff --git a/core/l10n/de.js b/core/l10n/de.js index f3ec71a402c..f34310e16af 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -209,10 +209,11 @@ OC.L10N.register( "An error occurred (\"{message}\"). Please try again" : "Benötigt keine Übersetzung. Für iOS wird nur die formelle Übersetzung verwendet (de_DE). ", "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", - "{sharee} (remote)" : "{sharee} (entfernt)", + "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (remote group)" : "{sharee} (externe Gruppe)", "{sharee} (email)" : "{sharee} (E-Mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Teilen", "Name or email address..." : "Name oder E-Mail-Adresse…", "Name or federated cloud ID..." : "Name oder Federated-Cloud-ID…", diff --git a/core/l10n/de.json b/core/l10n/de.json index a9b3158a3eb..0352314c821 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -207,10 +207,11 @@ "An error occurred (\"{message}\"). Please try again" : "Benötigt keine Übersetzung. Für iOS wird nur die formelle Übersetzung verwendet (de_DE). ", "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", - "{sharee} (remote)" : "{sharee} (entfernt)", + "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (remote group)" : "{sharee} (externe Gruppe)", "{sharee} (email)" : "{sharee} (E-Mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Teilen", "Name or email address..." : "Name oder E-Mail-Adresse…", "Name or federated cloud ID..." : "Name oder Federated-Cloud-ID…", diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js index 91418688c15..fdb29b7c3c8 100644 --- a/core/l10n/de_DE.js +++ b/core/l10n/de_DE.js @@ -209,10 +209,11 @@ OC.L10N.register( "An error occurred (\"{message}\"). Please try again" : "Es ist ein Fehler aufgetreten (\"{message}\"). Bitte erneut versuchen.", "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", - "{sharee} (remote)" : "{sharee} (entfernt)", + "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (remote group)" : "{sharee} (Externe Gruppe)", "{sharee} (email)" : "{sharee} (E-Mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Teilen", "Name or email address..." : "Name oder E-Mail-Adresse…", "Name or federated cloud ID..." : "Name oder Federated-Cloud-ID…", diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json index 7aa8d70286f..e09cfa4eddb 100644 --- a/core/l10n/de_DE.json +++ b/core/l10n/de_DE.json @@ -207,10 +207,11 @@ "An error occurred (\"{message}\"). Please try again" : "Es ist ein Fehler aufgetreten (\"{message}\"). Bitte erneut versuchen.", "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal", "{sharee} (group)" : "{sharee} (Gruppe)", - "{sharee} (remote)" : "{sharee} (entfernt)", + "{sharee} (remote)" : "{sharee} (remote)", "{sharee} (remote group)" : "{sharee} (Externe Gruppe)", "{sharee} (email)" : "{sharee} (E-Mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Teilen", "Name or email address..." : "Name oder E-Mail-Adresse…", "Name or federated cloud ID..." : "Name oder Federated-Cloud-ID…", diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 7fefd3c0f87..c1d5b069eeb 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -144,6 +144,8 @@ OC.L10N.register( "This is particularly recommended when using the desktop client for file synchronisation." : "C'est particulièrement recommandé lorsque l'on utilise un client bureau pour la synchronisation des fichiers.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>.", "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "L'utilisation de la fonctionnalité d'envoi d'e-mails native de PHP n'est plus supportée. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Merci de mettre à jour les paramètres d'envoi d'e-mails de votre serveur ↗ <a/>", + "The PHP memory limit is below the recommended value of 512MB." : "La limite de mémoire PHP est inférieure à la valeur recommandée de 512 Mo.", + "Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:" : "Certains répertoires d'applications appartiennent à un utilisateur différent de celui du serveur web. Cela peut être le cas si les applications ont été installées manuellement. Vérifiez les permissions des répertoires d'applications suivants :", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\". Ceci constitue un risque potentiel relatif à la sécurité et à la vie privée étant donné qu'il est recommandé d'ajuster ce paramètre.", @@ -211,6 +213,7 @@ OC.L10N.register( "{sharee} (remote group)" : "{sharee} (groupe distant)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (discussion)", "Share" : "Partager", "Name or email address..." : "Nom ou adresse mail...", "Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...", diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 45cffe3d557..851909fadc5 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -142,6 +142,8 @@ "This is particularly recommended when using the desktop client for file synchronisation." : "C'est particulièrement recommandé lorsque l'on utilise un client bureau pour la synchronisation des fichiers.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>.", "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "L'utilisation de la fonctionnalité d'envoi d'e-mails native de PHP n'est plus supportée. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Merci de mettre à jour les paramètres d'envoi d'e-mails de votre serveur ↗ <a/>", + "The PHP memory limit is below the recommended value of 512MB." : "La limite de mémoire PHP est inférieure à la valeur recommandée de 512 Mo.", + "Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:" : "Certains répertoires d'applications appartiennent à un utilisateur différent de celui du serveur web. Cela peut être le cas si les applications ont été installées manuellement. Vérifiez les permissions des répertoires d'applications suivants :", "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\". Ceci constitue un risque potentiel relatif à la sécurité et à la vie privée étant donné qu'il est recommandé d'ajuster ce paramètre.", @@ -209,6 +211,7 @@ "{sharee} (remote group)" : "{sharee} (groupe distant)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (discussion)", "Share" : "Partager", "Name or email address..." : "Nom ou adresse mail...", "Name or federated cloud ID..." : "Nom ou ID du cloud fédéré...", diff --git a/core/l10n/it.js b/core/l10n/it.js index 03467d06b1a..56dcc075b45 100644 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -213,6 +213,7 @@ OC.L10N.register( "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Condividi", "Name or email address..." : "Nome o indirizzo email...", "Name or federated cloud ID..." : "Nome o ID di cloud federata...", diff --git a/core/l10n/it.json b/core/l10n/it.json index ecde940afba..08a60d1ac63 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -211,6 +211,7 @@ "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Condividi", "Name or email address..." : "Nome o indirizzo email...", "Name or federated cloud ID..." : "Nome o ID di cloud federata...", diff --git a/core/l10n/nb.js b/core/l10n/nb.js index 1115410b949..9fd491dd498 100644 --- a/core/l10n/nb.js +++ b/core/l10n/nb.js @@ -92,7 +92,7 @@ OC.L10N.register( "OK" : "OK", "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}", "read-only" : "skrivebeskyttet", - "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"], + "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} fil konflikter"], "One file conflict" : "En filkonflikt", "New Files" : "Nye filer", "Already existing files" : "Allerede eksisterende filer", @@ -104,8 +104,8 @@ OC.L10N.register( "({count} selected)" : "({count} valgt)", "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal", "Pending" : "Venter", - "Copy to {folder}" : "Kopier til {mappe}", - "Move to {folder}" : "Flytt til {mappe}", + "Copy to {folder}" : "Kopier til {folder}", + "Move to {folder}" : "Flytt til {folder}", "New in" : "Ny i", "View changelog" : "Se endringslogg", "Very weak password" : "Veldig svakt passord", @@ -144,6 +144,8 @@ OC.L10N.register( "This is particularly recommended when using the desktop client for file synchronisation." : "Dette anbefales spesielt når du bruker skrivebordsklienten for filsynkronisering.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db: convert-type', eller se <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjon ↗</a>.", "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "Bruk av den innebygde php e-post sending støttes ikke lenger. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Vennligst oppdater innstillinger for e-postserver ↗<a/>.", + "The PHP memory limit is below the recommended value of 512MB." : "PHP er satt opp med mindre minne enn anbefalt minste verdi på 512MB.", + "Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:" : "Enkelte mapper er eid av annen bruker enn den vev tjener kjøre under. Dette kan kan oppstå hvis program/utvidelser er installert manuelt. Sjekk eierskap og tillatelser på følgende mapper:", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av tjener-oppsett", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan nås eller at du flytter datamappen ut av vev-tjenerens dokumentrot.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "HTTP-hodet \"{header}\" er ikke satt opp likt \"{expected}\". Dette kan være en sikkerhet- eller personvernsrisiko og det anbefales at denne innstillingen endres.", @@ -211,6 +213,7 @@ OC.L10N.register( "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Del", "Name or email address..." : "Navn eller e-postadresse…", "Name or federated cloud ID..." : "Navn eller sammenknyttet sky-ID…", @@ -243,7 +246,7 @@ OC.L10N.register( "Continue to Nextcloud" : "Fortsett til Nextcloud", "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %n sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %n sekunder."], "Searching other places" : "Søker andre steder", - "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søkeresultat i en annen mappe","{count} søkeresultater i andre mapper"], "Personal" : "Personlig", "Users" : "Brukere", diff --git a/core/l10n/nb.json b/core/l10n/nb.json index 3f374cd0c4a..291a9dbb009 100644 --- a/core/l10n/nb.json +++ b/core/l10n/nb.json @@ -90,7 +90,7 @@ "OK" : "OK", "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}", "read-only" : "skrivebeskyttet", - "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"], + "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} fil konflikter"], "One file conflict" : "En filkonflikt", "New Files" : "Nye filer", "Already existing files" : "Allerede eksisterende filer", @@ -102,8 +102,8 @@ "({count} selected)" : "({count} valgt)", "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal", "Pending" : "Venter", - "Copy to {folder}" : "Kopier til {mappe}", - "Move to {folder}" : "Flytt til {mappe}", + "Copy to {folder}" : "Kopier til {folder}", + "Move to {folder}" : "Flytt til {folder}", "New in" : "Ny i", "View changelog" : "Se endringslogg", "Very weak password" : "Veldig svakt passord", @@ -142,6 +142,8 @@ "This is particularly recommended when using the desktop client for file synchronisation." : "Dette anbefales spesielt når du bruker skrivebordsklienten for filsynkronisering.", "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db: convert-type', eller se <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">dokumentasjon ↗</a>.", "Use of the the built in php mailer is no longer supported. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Please update your email server settings ↗<a/>." : "Bruk av den innebygde php e-post sending støttes ikke lenger. <a target=\"_blank\" rel=\"noreferrer noopener\" href=\"{docLink}\">Vennligst oppdater innstillinger for e-postserver ↗<a/>.", + "The PHP memory limit is below the recommended value of 512MB." : "PHP er satt opp med mindre minne enn anbefalt minste verdi på 512MB.", + "Some app directories are owned by a different user than the web server one. This may be the case if apps have been installed manually. Check the permissions of the following app directories:" : "Enkelte mapper er eid av annen bruker enn den vev tjener kjøre under. Dette kan kan oppstå hvis program/utvidelser er installert manuelt. Sjekk eierskap og tillatelser på følgende mapper:", "Error occurred while checking server setup" : "Feil oppstod ved sjekking av tjener-oppsett", "Your data directory and files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server so that the data directory is no longer accessible, or move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Det anbefales sterkt at du setter opp vev-tjeneren slik at datamappen ikke kan nås eller at du flytter datamappen ut av vev-tjenerens dokumentrot.", "The \"{header}\" HTTP header is not set to \"{expected}\". This is a potential security or privacy risk, as it is recommended to adjust this setting accordingly." : "HTTP-hodet \"{header}\" er ikke satt opp likt \"{expected}\". Dette kan være en sikkerhet- eller personvernsrisiko og det anbefales at denne innstillingen endres.", @@ -209,6 +211,7 @@ "{sharee} (remote group)" : "{sharee} (remote group)", "{sharee} (email)" : "{sharee} (email)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Del", "Name or email address..." : "Navn eller e-postadresse…", "Name or federated cloud ID..." : "Navn eller sammenknyttet sky-ID…", @@ -241,7 +244,7 @@ "Continue to Nextcloud" : "Fortsett til Nextcloud", "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["Oppdateringen var vellykket. Videresender deg til Nextcloud om %n sekund.","Oppdateringen var vellykket. Videresender deg til Nextcloud om %n sekunder."], "Searching other places" : "Søker andre steder", - "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", + "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}", "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søkeresultat i en annen mappe","{count} søkeresultater i andre mapper"], "Personal" : "Personlig", "Users" : "Brukere", diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js index ac4cfb58cdc..a8d0926fe34 100644 --- a/core/l10n/pt_BR.js +++ b/core/l10n/pt_BR.js @@ -213,6 +213,7 @@ OC.L10N.register( "{sharee} (remote group)" : "{sharee} (grupo remoto)", "{sharee} (email)" : "{sharee} (e-mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Compartilhar", "Name or email address..." : "Nome ou endereço de e-mail...", "Name or federated cloud ID..." : "Nome ou ID de cloud federada...", diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json index 357899869e4..00fcfe1cb00 100644 --- a/core/l10n/pt_BR.json +++ b/core/l10n/pt_BR.json @@ -211,6 +211,7 @@ "{sharee} (remote group)" : "{sharee} (grupo remoto)", "{sharee} (email)" : "{sharee} (e-mail)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (conversation)", "Share" : "Compartilhar", "Name or email address..." : "Nome ou endereço de e-mail...", "Name or federated cloud ID..." : "Nome ou ID de cloud federada...", diff --git a/core/l10n/tr.js b/core/l10n/tr.js index bc087e90eb4..698eac947c4 100644 --- a/core/l10n/tr.js +++ b/core/l10n/tr.js @@ -213,6 +213,7 @@ OC.L10N.register( "{sharee} (remote group)" : "{sharee} (uzak grup)", "{sharee} (email)" : "{sharee} (e-posta)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (görüşme)", "Share" : "Paylaş", "Name or email address..." : "Ad ya da e-posta adresi...", "Name or federated cloud ID..." : "Ad ya da birleşmiş bulut kodu...", diff --git a/core/l10n/tr.json b/core/l10n/tr.json index 1cf5c8a0927..8733bd8efe5 100644 --- a/core/l10n/tr.json +++ b/core/l10n/tr.json @@ -211,6 +211,7 @@ "{sharee} (remote group)" : "{sharee} (uzak grup)", "{sharee} (email)" : "{sharee} (e-posta)", "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})", + "{sharee} (conversation)" : "{sharee} (görüşme)", "Share" : "Paylaş", "Name or email address..." : "Ad ya da e-posta adresi...", "Name or federated cloud ID..." : "Ad ya da birleşmiş bulut kodu...", diff --git a/lib/l10n/es_CL.js b/lib/l10n/es_CL.js index ed7dcfac93d..df6c2ef4140 100644 --- a/lib/l10n/es_CL.js +++ b/lib/l10n/es_CL.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Chile)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_CL.json b/lib/l10n/es_CL.json index 1f4040a51fc..238ed0295bb 100644 --- a/lib/l10n/es_CL.json +++ b/lib/l10n/es_CL.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Chile)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_CO.js b/lib/l10n/es_CO.js index ed7dcfac93d..9af7b8be461 100644 --- a/lib/l10n/es_CO.js +++ b/lib/l10n/es_CO.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Colombia)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_CO.json b/lib/l10n/es_CO.json index 1f4040a51fc..a8b25e626c5 100644 --- a/lib/l10n/es_CO.json +++ b/lib/l10n/es_CO.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Colombia)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_CR.js b/lib/l10n/es_CR.js index ed7dcfac93d..74000ba74b8 100644 --- a/lib/l10n/es_CR.js +++ b/lib/l10n/es_CR.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Costa Rica)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_CR.json b/lib/l10n/es_CR.json index 1f4040a51fc..804922deb4a 100644 --- a/lib/l10n/es_CR.json +++ b/lib/l10n/es_CR.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Costa Rica)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_DO.js b/lib/l10n/es_DO.js index ed7dcfac93d..db9089aa785 100644 --- a/lib/l10n/es_DO.js +++ b/lib/l10n/es_DO.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Dominican Republic)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_DO.json b/lib/l10n/es_DO.json index 1f4040a51fc..0f173fb4fb0 100644 --- a/lib/l10n/es_DO.json +++ b/lib/l10n/es_DO.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Dominican Republic)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_EC.js b/lib/l10n/es_EC.js index ed7dcfac93d..5eff8d8d37d 100644 --- a/lib/l10n/es_EC.js +++ b/lib/l10n/es_EC.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Ecuador)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_EC.json b/lib/l10n/es_EC.json index 1f4040a51fc..a62906134c9 100644 --- a/lib/l10n/es_EC.json +++ b/lib/l10n/es_EC.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Ecuador)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_GT.js b/lib/l10n/es_GT.js index ed7dcfac93d..3f8d4509b92 100644 --- a/lib/l10n/es_GT.js +++ b/lib/l10n/es_GT.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Guatemala)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_GT.json b/lib/l10n/es_GT.json index 1f4040a51fc..febf89a632e 100644 --- a/lib/l10n/es_GT.json +++ b/lib/l10n/es_GT.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (Guatemala)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_SV.js b/lib/l10n/es_SV.js index ed7dcfac93d..acd3d325b1f 100644 --- a/lib/l10n/es_SV.js +++ b/lib/l10n/es_SV.js @@ -58,7 +58,7 @@ OC.L10N.register( "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (El Salvador)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/l10n/es_SV.json b/lib/l10n/es_SV.json index 1f4040a51fc..64edc8826c1 100644 --- a/lib/l10n/es_SV.json +++ b/lib/l10n/es_SV.json @@ -56,7 +56,7 @@ "Empty filename is not allowed" : "El uso de nombres de archivo vacíos no está permitido", "App \"%s\" cannot be installed because appinfo file cannot be read." : "La aplicación \"%s\" no puede ser instalada porque el archivo appinfo no se puede leer. ", "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión del servidor. ", - "__language_name__" : "Español (México)", + "__language_name__" : "Español (El Salvador)", "This is an automatically sent email, please do not reply." : "Este es un correo enviado automáticamente, por favor no lo contestes. ", "Help" : "Ayuda", "Apps" : "Aplicaciones", diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php index a6741652308..63abdf5fdeb 100644 --- a/lib/private/Files/Config/UserMountCache.php +++ b/lib/private/Files/Config/UserMountCache.php @@ -101,17 +101,31 @@ class UserMountCache implements IUserMountCache { } }, $mounts); $newMounts = array_values(array_filter($newMounts)); + $newMountRootIds = array_map(function (ICachedMountInfo $mount) { + return $mount->getRootId(); + }, $newMounts); + $newMounts = array_combine($newMountRootIds, $newMounts); $cachedMounts = $this->getMountsForUser($user); - $mountDiff = function (ICachedMountInfo $mount1, ICachedMountInfo $mount2) { - // since we are only looking for mounts for a specific user comparing on root id is enough - return $mount1->getRootId() - $mount2->getRootId(); - }; + $cachedMountRootIds = array_map(function (ICachedMountInfo $mount) { + return $mount->getRootId(); + }, $cachedMounts); + $cachedMounts = array_combine($cachedMountRootIds, $cachedMounts); - /** @var ICachedMountInfo[] $addedMounts */ - $addedMounts = array_udiff($newMounts, $cachedMounts, $mountDiff); - /** @var ICachedMountInfo[] $removedMounts */ - $removedMounts = array_udiff($cachedMounts, $newMounts, $mountDiff); + $addedMounts = []; + $removedMounts = []; + + foreach ($newMounts as $rootId => $newMount) { + if (!isset($cachedMounts[$rootId])) { + $addedMounts[] = $newMount; + } + } + + foreach ($cachedMounts as $rootId => $cachedMount) { + if (!isset($newMounts[$rootId])) { + $removedMounts[] = $cachedMount; + } + } $changedMounts = $this->findChangedMounts($newMounts, $cachedMounts); @@ -135,16 +149,19 @@ class UserMountCache implements IUserMountCache { * @return ICachedMountInfo[] */ private function findChangedMounts(array $newMounts, array $cachedMounts) { + $new = []; + foreach ($newMounts as $mount) { + $new[$mount->getRootId()] = $mount; + } $changed = []; - foreach ($newMounts as $newMount) { - foreach ($cachedMounts as $cachedMount) { + foreach ($cachedMounts as $cachedMount) { + $rootId = $cachedMount->getRootId(); + if (isset($new[$rootId])) { + $newMount = $new[$rootId]; if ( - $newMount->getRootId() === $cachedMount->getRootId() && - ( - $newMount->getMountPoint() !== $cachedMount->getMountPoint() || - $newMount->getStorageId() !== $cachedMount->getStorageId() || - $newMount->getMountId() !== $cachedMount->getMountId() - ) + $newMount->getMountPoint() !== $cachedMount->getMountPoint() || + $newMount->getStorageId() !== $cachedMount->getStorageId() || + $newMount->getMountId() !== $cachedMount->getMountId() ) { $changed[] = $newMount; } @@ -197,7 +214,7 @@ class UserMountCache implements IUserMountCache { } $mount_id = $row['mount_id']; if (!is_null($mount_id)) { - $mount_id = (int) $mount_id; + $mount_id = (int)$mount_id; } return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $mount_id, isset($row['path']) ? $row['path'] : ''); } diff --git a/lib/private/Files/Mount/Manager.php b/lib/private/Files/Mount/Manager.php index 019dda03a40..1293b8549a5 100644 --- a/lib/private/Files/Mount/Manager.php +++ b/lib/private/Files/Mount/Manager.php @@ -38,8 +38,12 @@ class Manager implements IMountManager { /** @var CappedMemoryCache */ private $pathCache; + /** @var CappedMemoryCache */ + private $inPathCache; + public function __construct() { $this->pathCache = new CappedMemoryCache(); + $this->inPathCache = new CappedMemoryCache(); } /** @@ -48,6 +52,7 @@ class Manager implements IMountManager { public function addMount(IMountPoint $mount) { $this->mounts[$mount->getMountPoint()] = $mount; $this->pathCache->clear(); + $this->inPathCache->clear(); } /** @@ -60,16 +65,18 @@ class Manager implements IMountManager { } unset($this->mounts[$mountPoint]); $this->pathCache->clear(); + $this->inPathCache->clear(); } /** * @param string $mountPoint * @param string $target */ - public function moveMount(string $mountPoint, string $target){ + public function moveMount(string $mountPoint, string $target) { $this->mounts[$target] = $this->mounts[$mountPoint]; unset($this->mounts[$mountPoint]); $this->pathCache->clear(); + $this->inPathCache->clear(); } /** @@ -80,32 +87,29 @@ class Manager implements IMountManager { */ public function find(string $path) { \OC_Util::setupFS(); - $path = $this->formatPath($path); - if (isset($this->mounts[$path])) { - return $this->mounts[$path]; - } + $path = Filesystem::normalizePath($path); if (isset($this->pathCache[$path])) { return $this->pathCache[$path]; } - \OC_Hook::emit('OC_Filesystem', 'get_mountpoint', ['path' => $path]); - $foundMountPoint = ''; - $mountPoints = array_keys($this->mounts); - $foundMountPointLength = 0; - foreach ($mountPoints as $mountpoint) { - if (\strlen($mountpoint) > $foundMountPointLength && strpos($path, $mountpoint) === 0) { - $foundMountPoint = $mountpoint; - $foundMountPointLength = \strlen($foundMountPoint); + $current = $path; + while (true) { + $mountPoint = $current . '/'; + if (isset($this->mounts[$mountPoint])) { + $this->pathCache[$path] = $this->mounts[$mountPoint]; + return $this->mounts[$mountPoint]; } - } - if (isset($this->mounts[$foundMountPoint])) { - $this->pathCache[$path] = $this->mounts[$foundMountPoint]; - return $this->mounts[$foundMountPoint]; - } + if ($current === '') { + return null; + } - return null; + $current = dirname($current); + if ($current === '.' || $current === '/') { + $current = ''; + } + } } /** @@ -117,6 +121,11 @@ class Manager implements IMountManager { public function findIn(string $path): array { \OC_Util::setupFS(); $path = $this->formatPath($path); + + if (isset($this->inPathCache[$path])) { + return $this->inPathCache[$path]; + } + $result = []; $pathLength = \strlen($path); $mountPoints = array_keys($this->mounts); @@ -125,12 +134,15 @@ class Manager implements IMountManager { $result[] = $this->mounts[$mountPoint]; } } + + $this->inPathCache[$path] = $result; return $result; } public function clear() { $this->mounts = []; $this->pathCache->clear(); + $this->inPathCache->clear(); } /** diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index c6429a89942..19e38717803 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1433,16 +1433,21 @@ class View { $contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter $sharingDisabled = \OCP\Util::isSharingDisabledForUser(); + + $fileNames = array_map(function(ICacheEntry $content) { + return $content->getName(); + }, $contents); /** - * @var \OC\Files\FileInfo[] $files + * @var \OC\Files\FileInfo[] $fileInfos */ - $files = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) { + $fileInfos = array_map(function (ICacheEntry $content) use ($path, $storage, $mount, $sharingDisabled) { if ($sharingDisabled) { $content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE; } $owner = $this->getUserObjectForOwner($storage->getOwner($content['path'])); return new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount, $owner); }, $contents); + $files = array_combine($fileNames, $fileInfos); //add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders $mounts = Filesystem::getMountManager()->findIn($path); @@ -1496,13 +1501,6 @@ class View { $rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE)); } - //remove any existing entry with the same name - foreach ($files as $i => $file) { - if ($file['name'] === $rootEntry['name']) { - unset($files[$i]); - break; - } - } $rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/ // if sharing was disabled for the user we remove the share permissions @@ -1511,7 +1509,7 @@ class View { } $owner = $this->getUserObjectForOwner($subStorage->getOwner('')); - $files[] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner); + $files[$rootEntry->getName()] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount, $owner); } } } @@ -1527,7 +1525,7 @@ class View { }); } - return $files; + return array_values($files); } else { return []; } diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php index 151326129bc..54bc212b6b5 100644 --- a/lib/private/Preview/HEIC.php +++ b/lib/private/Preview/HEIC.php @@ -1,4 +1,5 @@ <?php +declare(strict_types=1); /** * @author Thomas Müller <thomas.mueller@tmit.eu> * @@ -22,19 +23,118 @@ namespace OC\Preview; -class HEIC extends Bitmap { +use OCP\ILogger; + +/** + * Creates a JPG preview using ImageMagick via the PECL extension + * + * @package OC\Preview + */ +class HEIC extends Provider { /** * {@inheritDoc} */ - public function getMimeType() { + public function getMimeType(): string { return '/image\/hei(f|c)/'; } /** * {@inheritDoc} */ - public function isAvailable(\OCP\Files\FileInfo $file) { - return in_array("HEIC", \Imagick::queryFonts("HEI*") ); + public function isAvailable(\OCP\Files\FileInfo $file): bool { + return in_array('HEIC', \Imagick::queryFormats("HEI*")); + } + + /** + * {@inheritDoc} + */ + public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { + $tmpPath = $fileview->toTmpFile($path); + if (!$tmpPath) { + return false; + } + + // Creates \Imagick object from the heic file + try { + $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY); + $bp->setFormat('jpg'); + } catch (\Exception $e) { + \OC::$server->getLogger()->logException($e, [ + 'message' => 'File: ' . $fileview->getAbsolutePath($path) . ' Imagick says:', + 'level' => ILogger::ERROR, + 'app' => 'core', + ]); + return false; + } + + unlink($tmpPath); + + //new bitmap image object + $image = new \OC_Image(); + $image->loadFromData($bp); + //check if image object is valid + return $image->valid() ? $image : false; + } + + /** + * Returns a preview of maxX times maxY dimensions in JPG format + * + * * The default resolution is already 72dpi, no need to change it for a bitmap output + * * It's possible to have proper colour conversion using profileimage(). + * ICC profiles are here: http://www.color.org/srgbprofiles.xalter + * * It's possible to Gamma-correct an image via gammaImage() + * + * @param string $tmpPath the location of the file to convert + * @param int $maxX + * @param int $maxY + * + * @return \Imagick + */ + private function getResizedPreview($tmpPath, $maxX, $maxY) { + $bp = new \Imagick(); + + // Layer 0 contains either the bitmap or a flat representation of all vector layers + $bp->readImage($tmpPath . '[0]'); + + $bp->setImageFormat('jpg'); + + $bp = $this->resize($bp, $maxX, $maxY); + + return $bp; + } + + /** + * Returns a resized \Imagick object + * + * If you want to know more on the various methods available to resize an + * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im + * + * @param \Imagick $bp + * @param int $maxX + * @param int $maxY + * + * @return \Imagick + */ + private function resize($bp, $maxX, $maxY) { + list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry()); + + // We only need to resize a preview which doesn't fit in the maximum dimensions + if ($previewWidth > $maxX || $previewHeight > $maxY) { + // If we want a small image (thumbnail) let's be most space- and time-efficient + if ($maxX <= 500 && $maxY <= 500) { + $bp->thumbnailImage($maxY, $maxX, true); + $bp->stripImage(); + } else { + // A bigger image calls for some better resizing algorithm + // According to http://www.imagemagick.org/Usage/filter/#lanczos + // the catrom filter is almost identical to Lanczos2, but according + // to http://php.net/manual/en/imagick.resizeimage.php it is + // significantly faster + $bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true); + } + } + + return $bp; } } diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 037ea53048a..9497b2c2637 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1208,6 +1208,10 @@ class Manager implements IManager { * @throws ShareNotFound */ public function getShareByToken($token) { + // tokens can't be valid local user names + if ($this->userManager->userExists($token)) { + throw new ShareNotFound(); + } $share = null; try { if($this->shareApiAllowLinks()) { diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index ab52a68caeb..9c7e6001e5e 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -152,7 +152,7 @@ class OC_App { \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app); try { self::requireAppFile($app); - } catch (Error $ex) { + } catch (Throwable $ex) { \OC::$server->getLogger()->logException($ex); if (!\OC::$server->getAppManager()->isShipped($app)) { // Only disable apps which are not shipped diff --git a/resources/app-info-shipped.xsd b/resources/app-info-shipped.xsd index 97221d1fb9c..a9a93dc7d18 100644 --- a/resources/app-info-shipped.xsd +++ b/resources/app-info-shipped.xsd @@ -525,6 +525,7 @@ <xs:enumeration value="SHARE_TYPE_REMOTE"/> <xs:enumeration value="SHARE_TYPE_CIRCLE"/> <xs:enumeration value="SHARE_TYPE_GUEST"/> + <xs:enumeration value="SHARE_TYPE_ROOM"/> </xs:restriction> </xs:simpleType> diff --git a/resources/app-info.xsd b/resources/app-info.xsd index 516d984674e..c3520e23ef1 100644 --- a/resources/app-info.xsd +++ b/resources/app-info.xsd @@ -522,6 +522,7 @@ <xs:enumeration value="SHARE_TYPE_REMOTE"/> <xs:enumeration value="SHARE_TYPE_CIRCLE"/> <xs:enumeration value="SHARE_TYPE_GUEST"/> + <xs:enumeration value="SHARE_TYPE_ROOM"/> </xs:restriction> </xs:simpleType> diff --git a/settings/l10n/es.js b/settings/l10n/es.js index cf8f99f8a16..53c65cc749c 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -56,6 +56,7 @@ OC.L10N.register( "Set your password" : "Establezca su contraseña", "Go to %s" : "Vaya a %s", "Install Client" : "Instalar cliente", + "Logged in user must be a subadmin" : "El usuario registrado debe ser un subadministrador", "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor, espere hasta que la migración esté finalizada.", "Migration started …" : "Migración iniciada...", "Not saved" : "No guardado", @@ -103,35 +104,61 @@ OC.L10N.register( "Good password" : "Contraseña buena", "Strong password" : "Contraseña muy buena", "An error occured while changing your language. Please reload the page and try again." : "Se ha producido un fallo al cambiar el idioma. Por favor, vuelve a cargar la página y vuelve a intentarlo.", + "An error occured while changing your locale. Please reload the page and try again." : "Se ha producido un error al cambiar de local. Por favor, recarga la página y vuelve a intentarlo.", "Select a profile picture" : "Seleccionar una imagen de perfil", + "Week starts on {fdow}" : "La semana empieza el {fdow}", "Groups" : "Grupos", + "Group list is empty" : "La lista de grupos está vacía", + "Unable to retrieve the group list" : "No se ha podido recuperar la lista de grupos.", "Official" : "Oficial", + "No results" : "No hay resultados", "Visit website" : "Visite nuestro sitio web", "User documentation" : "Documentación de usuario", "Developer documentation" : "Documentación de desarrollador", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión mínima de Nextcloud asignada. Esto será un error en el futuro.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:", + "{license}-licensed" : "licenciado bajo {license}", + "Disable all" : "Deshabilitar todos", "Enable all" : "Activar todas", + "Download and enable" : "Descargar y activar", "Enable" : "Activar", "The app will be downloaded from the app store" : "La app va a ser descargada de una tienda de aplicaciones", "Settings" : "Configuración", + "You do not have permissions to see the details of this user" : "No tienes permisos para ver los detalles de este usuario", + "Delete user" : "Eliminar usuario", + "Disable user" : "Inhabilitar usuario", + "Enable user" : "Habilitar usuario", + "Resend welcome email" : "Volver a enviar correo de bienvenida", + "Welcome mail sent!" : "Correo de bienvenida enviado.", + "Display name" : "Nombre para mostrar", "Email" : "Correo electrónico", "Group admin for" : "Administrador de grupo para", "Language" : "Idioma", "User backend" : "Motor de usuario", "Unlimited" : "Ilimitado", "Default quota" : "Espacio predeterminado", + "Default language" : "Idioma predeterminado", + "Password change is disabled because the master key is disabled" : "El cambio de contraseña está desactivado porque la clave maestra está desactivada", + "Common languages" : "Idiomas habituales", + "All languages" : "Todos los idiomas", "You did not enter the password in time" : "No introdujo la contraseña a tiempo", "An error occured during the request. Unable to proceed." : "Ha ocurrido un error durante la petición. No se puede continuar.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La app ha sido activada pero tiene que actualizarse. Serás redirigido a la página de actualización en 5 segundos.", "App update" : "Actualización de la aplicación", "Error: This app can not be enabled because it makes the server unstable" : "Error: Esta app no se puede activar porque desestabiliza el servidor", "Your apps" : "Tus apps", + "Active apps" : "Apps activas", "Disabled apps" : "Apps deshabilitadas", "Updates" : "Actualizaciones", "App bundles" : "Lotes de apps", + "Default quota :" : "Espacio por defecto:", + "You are about to remove the group {group}. The users will NOT be deleted." : "Vas a eliminar el grupo {group}. Los usuarios NO serán eliminados.", + "Please confirm the group removal " : "Por favor, confirma la eliminación del grupo", + "Remove group" : "Eliminar grupo", "Admins" : "Administradores", + "Disabled users" : "Usuarios inhabilitados", "Everyone" : "Todos", + "New user" : "Nuevo usuario", "SSL Root Certificates" : "Raíz de certificados SSL ", "Common Name" : "Nombre común", "Valid until" : "Válido hasta", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index f7731432e96..d2f968e9ae6 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -54,6 +54,7 @@ "Set your password" : "Establezca su contraseña", "Go to %s" : "Vaya a %s", "Install Client" : "Instalar cliente", + "Logged in user must be a subadmin" : "El usuario registrado debe ser un subadministrador", "Migration in progress. Please wait until the migration is finished" : "Migración en curso. Por favor, espere hasta que la migración esté finalizada.", "Migration started …" : "Migración iniciada...", "Not saved" : "No guardado", @@ -101,35 +102,61 @@ "Good password" : "Contraseña buena", "Strong password" : "Contraseña muy buena", "An error occured while changing your language. Please reload the page and try again." : "Se ha producido un fallo al cambiar el idioma. Por favor, vuelve a cargar la página y vuelve a intentarlo.", + "An error occured while changing your locale. Please reload the page and try again." : "Se ha producido un error al cambiar de local. Por favor, recarga la página y vuelve a intentarlo.", "Select a profile picture" : "Seleccionar una imagen de perfil", + "Week starts on {fdow}" : "La semana empieza el {fdow}", "Groups" : "Grupos", + "Group list is empty" : "La lista de grupos está vacía", + "Unable to retrieve the group list" : "No se ha podido recuperar la lista de grupos.", "Official" : "Oficial", + "No results" : "No hay resultados", "Visit website" : "Visite nuestro sitio web", "User documentation" : "Documentación de usuario", "Developer documentation" : "Documentación de desarrollador", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Esta app no tiene una versión mínima de Nextcloud asignada. Esto será un error en el futuro.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicación no puede instalarse porque las siguientes dependencias no están cumplimentadas:", + "{license}-licensed" : "licenciado bajo {license}", + "Disable all" : "Deshabilitar todos", "Enable all" : "Activar todas", + "Download and enable" : "Descargar y activar", "Enable" : "Activar", "The app will be downloaded from the app store" : "La app va a ser descargada de una tienda de aplicaciones", "Settings" : "Configuración", + "You do not have permissions to see the details of this user" : "No tienes permisos para ver los detalles de este usuario", + "Delete user" : "Eliminar usuario", + "Disable user" : "Inhabilitar usuario", + "Enable user" : "Habilitar usuario", + "Resend welcome email" : "Volver a enviar correo de bienvenida", + "Welcome mail sent!" : "Correo de bienvenida enviado.", + "Display name" : "Nombre para mostrar", "Email" : "Correo electrónico", "Group admin for" : "Administrador de grupo para", "Language" : "Idioma", "User backend" : "Motor de usuario", "Unlimited" : "Ilimitado", "Default quota" : "Espacio predeterminado", + "Default language" : "Idioma predeterminado", + "Password change is disabled because the master key is disabled" : "El cambio de contraseña está desactivado porque la clave maestra está desactivada", + "Common languages" : "Idiomas habituales", + "All languages" : "Todos los idiomas", "You did not enter the password in time" : "No introdujo la contraseña a tiempo", "An error occured during the request. Unable to proceed." : "Ha ocurrido un error durante la petición. No se puede continuar.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "La app ha sido activada pero tiene que actualizarse. Serás redirigido a la página de actualización en 5 segundos.", "App update" : "Actualización de la aplicación", "Error: This app can not be enabled because it makes the server unstable" : "Error: Esta app no se puede activar porque desestabiliza el servidor", "Your apps" : "Tus apps", + "Active apps" : "Apps activas", "Disabled apps" : "Apps deshabilitadas", "Updates" : "Actualizaciones", "App bundles" : "Lotes de apps", + "Default quota :" : "Espacio por defecto:", + "You are about to remove the group {group}. The users will NOT be deleted." : "Vas a eliminar el grupo {group}. Los usuarios NO serán eliminados.", + "Please confirm the group removal " : "Por favor, confirma la eliminación del grupo", + "Remove group" : "Eliminar grupo", "Admins" : "Administradores", + "Disabled users" : "Usuarios inhabilitados", "Everyone" : "Todos", + "New user" : "Nuevo usuario", "SSL Root Certificates" : "Raíz de certificados SSL ", "Common Name" : "Nombre común", "Valid until" : "Válido hasta", diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js index c22e5dee473..f14f05b5fb2 100644 --- a/settings/l10n/fr.js +++ b/settings/l10n/fr.js @@ -56,6 +56,7 @@ OC.L10N.register( "Set your password" : "Saisissez votre mot de passe", "Go to %s" : "Aller à %s", "Install Client" : "Installer le Client", + "Logged in user must be a subadmin" : "L'utilisateur connecté doit être un sous-administrateur", "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine", "Migration started …" : "Migration démarrée...", "Not saved" : "Non sauvegardé", @@ -103,35 +104,61 @@ OC.L10N.register( "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe de forte sécurité", "An error occured while changing your language. Please reload the page and try again." : "Une erreur est survenue lors du changement de votre langue. Merci de recharger la page et de réessayer.", + "An error occured while changing your locale. Please reload the page and try again." : "Une erreur est survenue lors du changement de vos paramètres régionaux. Veuillez recharger la page et réessayer.", "Select a profile picture" : "Selectionnez une photo de profil ", + "Week starts on {fdow}" : "La semaine commence le {fdow}", "Groups" : "Groupes", + "Group list is empty" : "La liste du groupe est vide", + "Unable to retrieve the group list" : "Impossible de récupérer la liste du groupe", "Official" : "Officielle", + "No results" : "Aucun résultat", "Visit website" : "Visiter le site web", "User documentation" : "Documentation utilisateur", "Developer documentation" : "Documentation pour développeurs", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version minimum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", + "{license}-licensed" : "{license}-Sous licence", + "Disable all" : "Tout désactiver", "Enable all" : "Tout activer", + "Download and enable" : "Télécharger et activer", "Enable" : "Activer", "The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store", "Settings" : "Paramètres", + "You do not have permissions to see the details of this user" : "Vous n'avez pas les autorisations pour voir le détail de cet utilisateur", + "Delete user" : "Supprimer l'utilisateur", + "Disable user" : "Désactiver l'utilisateur", + "Enable user" : "Activer l'utilisateur", + "Resend welcome email" : "Renvoyer l'e-mail de bienvenue", + "Welcome mail sent!" : "E-mail de bienvenue envoyé !", + "Display name" : "Afficher le nom", "Email" : "Adresse e-mail", "Group admin for" : "Administrateur de groupe pour", "Language" : "Langue", "User backend" : "Retour utilisateur", "Unlimited" : "Illimité", "Default quota" : "Quota par défaut", + "Default language" : "Langue par défaut", + "Password change is disabled because the master key is disabled" : "Le changement de mot de passe est désactivé car la clé principale est désactivée", + "Common languages" : "Langues communes", + "All languages" : "Toutes les langues", "You did not enter the password in time" : "Vous n'avez pas rentrer votre mot de passe dans le temps imparti", "An error occured during the request. Unable to proceed." : "Une erreur est survenue durant la requête. Impossible de traiter la demande.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour de l'application", "Error: This app can not be enabled because it makes the server unstable" : "Erreur : Cette application ne peut pas être activée car cela rend le serveur instable.", "Your apps" : "Vos applications", + "Active apps" : "Applications actives", "Disabled apps" : "Applications désactivées", "Updates" : "Mises à jour", "App bundles" : "Pack d'applications", + "Default quota :" : "Quota par défaut :", + "You are about to remove the group {group}. The users will NOT be deleted." : "Vous êtes sur le point de supprimer le groupe {group}. Les utilisateurs ne seront PAS supprimés.", + "Please confirm the group removal " : "Veuillez confirmer la suppression du groupe", + "Remove group" : "Supprimer le groupe", "Admins" : "Administrateurs", + "Disabled users" : "Désactiver les utilisateurs", "Everyone" : "Tout le monde", + "New user" : "Nouvel utilisateur", "SSL Root Certificates" : "Certificats Racines SSL", "Common Name" : "Nom d'usage", "Valid until" : "Valide jusqu'à", @@ -139,6 +166,7 @@ OC.L10N.register( "Valid until %s" : "Valide jusqu'à %s", "Import root certificate" : "Importer un certificat racine", "Administrator documentation" : "Documentation administrateur", + "Documentation" : "Documentation", "Forum" : "Forum", "None" : "Aucun", "Login" : "Login", diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json index 3a105a277e7..9040fb8bb9f 100644 --- a/settings/l10n/fr.json +++ b/settings/l10n/fr.json @@ -54,6 +54,7 @@ "Set your password" : "Saisissez votre mot de passe", "Go to %s" : "Aller à %s", "Install Client" : "Installer le Client", + "Logged in user must be a subadmin" : "L'utilisateur connecté doit être un sous-administrateur", "Migration in progress. Please wait until the migration is finished" : "Migration en cours. Veuillez attendre que celle-ci se termine", "Migration started …" : "Migration démarrée...", "Not saved" : "Non sauvegardé", @@ -101,35 +102,61 @@ "Good password" : "Mot de passe de sécurité suffisante", "Strong password" : "Mot de passe de forte sécurité", "An error occured while changing your language. Please reload the page and try again." : "Une erreur est survenue lors du changement de votre langue. Merci de recharger la page et de réessayer.", + "An error occured while changing your locale. Please reload the page and try again." : "Une erreur est survenue lors du changement de vos paramètres régionaux. Veuillez recharger la page et réessayer.", "Select a profile picture" : "Selectionnez une photo de profil ", + "Week starts on {fdow}" : "La semaine commence le {fdow}", "Groups" : "Groupes", + "Group list is empty" : "La liste du groupe est vide", + "Unable to retrieve the group list" : "Impossible de récupérer la liste du groupe", "Official" : "Officielle", + "No results" : "Aucun résultat", "Visit website" : "Visiter le site web", "User documentation" : "Documentation utilisateur", "Developer documentation" : "Documentation pour développeurs", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Cette application n'a pas de version minimum Nextcloud exigée. Ce sera considéré comme une erreur à l'avenir.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :", + "{license}-licensed" : "{license}-Sous licence", + "Disable all" : "Tout désactiver", "Enable all" : "Tout activer", + "Download and enable" : "Télécharger et activer", "Enable" : "Activer", "The app will be downloaded from the app store" : "Cette application va être téléchargée depuis l'app store", "Settings" : "Paramètres", + "You do not have permissions to see the details of this user" : "Vous n'avez pas les autorisations pour voir le détail de cet utilisateur", + "Delete user" : "Supprimer l'utilisateur", + "Disable user" : "Désactiver l'utilisateur", + "Enable user" : "Activer l'utilisateur", + "Resend welcome email" : "Renvoyer l'e-mail de bienvenue", + "Welcome mail sent!" : "E-mail de bienvenue envoyé !", + "Display name" : "Afficher le nom", "Email" : "Adresse e-mail", "Group admin for" : "Administrateur de groupe pour", "Language" : "Langue", "User backend" : "Retour utilisateur", "Unlimited" : "Illimité", "Default quota" : "Quota par défaut", + "Default language" : "Langue par défaut", + "Password change is disabled because the master key is disabled" : "Le changement de mot de passe est désactivé car la clé principale est désactivée", + "Common languages" : "Langues communes", + "All languages" : "Toutes les langues", "You did not enter the password in time" : "Vous n'avez pas rentrer votre mot de passe dans le temps imparti", "An error occured during the request. Unable to proceed." : "Une erreur est survenue durant la requête. Impossible de traiter la demande.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'application a été activée mais doit être mise à jour. Vous allez être redirigé vers la page des mises à jour dans 5 secondes.", "App update" : "Mise à jour de l'application", "Error: This app can not be enabled because it makes the server unstable" : "Erreur : Cette application ne peut pas être activée car cela rend le serveur instable.", "Your apps" : "Vos applications", + "Active apps" : "Applications actives", "Disabled apps" : "Applications désactivées", "Updates" : "Mises à jour", "App bundles" : "Pack d'applications", + "Default quota :" : "Quota par défaut :", + "You are about to remove the group {group}. The users will NOT be deleted." : "Vous êtes sur le point de supprimer le groupe {group}. Les utilisateurs ne seront PAS supprimés.", + "Please confirm the group removal " : "Veuillez confirmer la suppression du groupe", + "Remove group" : "Supprimer le groupe", "Admins" : "Administrateurs", + "Disabled users" : "Désactiver les utilisateurs", "Everyone" : "Tout le monde", + "New user" : "Nouvel utilisateur", "SSL Root Certificates" : "Certificats Racines SSL", "Common Name" : "Nom d'usage", "Valid until" : "Valide jusqu'à", @@ -137,6 +164,7 @@ "Valid until %s" : "Valide jusqu'à %s", "Import root certificate" : "Importer un certificat racine", "Administrator documentation" : "Documentation administrateur", + "Documentation" : "Documentation", "Forum" : "Forum", "None" : "Aucun", "Login" : "Login", diff --git a/settings/l10n/hu.js b/settings/l10n/hu.js index 8fa90c392b6..1dd56301a9e 100644 --- a/settings/l10n/hu.js +++ b/settings/l10n/hu.js @@ -56,6 +56,7 @@ OC.L10N.register( "Set your password" : "Állítsd be a jelszabad", "Go to %s" : "Menj ide: %s", "Install Client" : "Kliens telepítés", + "Logged in user must be a subadmin" : "Nem admin felhasználóként kell bejelentkezzen", "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.", "Migration started …" : "Migráció elindítva ...", "Not saved" : "Nincs mentve", @@ -103,35 +104,61 @@ OC.L10N.register( "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", "An error occured while changing your language. Please reload the page and try again." : "Hiba a nyelvváltás közben. Kérlek töltsd újra az oldalt és próbáld meg ismét.", + "An error occured while changing your locale. Please reload the page and try again." : "Hiba a hely váltása közben. Kérlek töltsd újra az oldalt és próbáld meg ismét.", "Select a profile picture" : "Válasszon profilképet!", + "Week starts on {fdow}" : "Hét kezdete {fdow}", "Groups" : "Csoportok", + "Group list is empty" : "Csoport lista üres", + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Official" : "Hivatalos", + "No results" : "Nincsenek eredmények", "Visit website" : "Weboldal meglátogatása", "User documentation" : "Felhasználói dokumentáció", "Developer documentation" : "Fejlesztői dokumentáció", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Ennek az alkalmazásnak nincs minimum szükséges Nextcloud verziója megadva. Ez hiba lesz a jövőben.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az alkalmazást nem lehet telepíteni, mert a következő függőségek hiányoznak:", + "{license}-licensed" : "{license}-licencelt", + "Disable all" : "Összes tiltása", "Enable all" : "Mind engedélyezése", + "Download and enable" : "Letöltés és engedélyezés", "Enable" : "Engedélyezés", "The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból", "Settings" : "Beállítások", + "You do not have permissions to see the details of this user" : "Nincs jogosultságod megnézni ennek a felhasználónak a részleteit.", + "Delete user" : "Felhasználó törlése", + "Disable user" : "Felhasználó tiltása", + "Enable user" : "Felhasználó engedélyezése", + "Resend welcome email" : "Üdvözlő üzenet ismételt küldése", + "Welcome mail sent!" : "Üdvöző üzenet elküldve!", + "Display name" : "Név megjelenítés", "Email" : "E-mail", "Group admin for" : "Csoport Adminisztrátor itt", "Language" : "Nyelv", "User backend" : "Felhasználói háttér", "Unlimited" : "Korlátlan", "Default quota" : "Alapértelmezett kvóta", + "Default language" : "Alapértelmezett nyelv", + "Password change is disabled because the master key is disabled" : "A jelszó változtatása tiltva van mert a mester kulcs tiltva van", + "Common languages" : "Alapvető nyelvek", + "All languages" : "Minden nyelv", "You did not enter the password in time" : "Nem adta meg időben a jelszót", "An error occured during the request. Unable to proceed." : "Hiba lépett fel a kérés közben. Nem lehet végrehajtani.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Ez az alkalmazás engedélyezve van, de frissíteni kell. A frissítő oldalra irányítjuk 5 másodpercen belül.", "App update" : "Alkalmazás frissítése", "Error: This app can not be enabled because it makes the server unstable" : "Hiba: az alkalmazás nem nem engedélyezhető, mert instabillá tenné a szervert", "Your apps" : "Alkalmazásaid", + "Active apps" : "Aktív alkalmazások", "Disabled apps" : "Letiltott alkalmazások", "Updates" : "Feltöltések", "App bundles" : "Alkalmazás csomagok", + "Default quota :" : "Alapértelmezett kvóta :", + "You are about to remove the group {group}. The users will NOT be deleted." : "A {group} csoportot fodja törölni. A felhasználó NEM fog törlődni.", + "Please confirm the group removal " : "Kérem erősítse meg a csoport törlését", + "Remove group" : "Csoport törlése", "Admins" : "Adminisztrátorok", + "Disabled users" : "Letiltott felhasználók", "Everyone" : "Mindenki", + "New user" : "Új felhasználó", "SSL Root Certificates" : "SSL Root tanusítványok", "Common Name" : "Általános Név", "Valid until" : "Érvényes", @@ -139,6 +166,7 @@ OC.L10N.register( "Valid until %s" : "Érvényes: %s", "Import root certificate" : "Gyökértanúsítvány importálása", "Administrator documentation" : "Adminisztrátori dokumentáció", + "Documentation" : "Dokumentáció", "Forum" : "Fórum", "None" : "Egyik sem", "Login" : "Login", diff --git a/settings/l10n/hu.json b/settings/l10n/hu.json index 5091e23b7f3..97bee692fd1 100644 --- a/settings/l10n/hu.json +++ b/settings/l10n/hu.json @@ -54,6 +54,7 @@ "Set your password" : "Állítsd be a jelszabad", "Go to %s" : "Menj ide: %s", "Install Client" : "Kliens telepítés", + "Logged in user must be a subadmin" : "Nem admin felhasználóként kell bejelentkezzen", "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérlek várj, míg a migráció befejeződik.", "Migration started …" : "Migráció elindítva ...", "Not saved" : "Nincs mentve", @@ -101,35 +102,61 @@ "Good password" : "Jó jelszó", "Strong password" : "Erős jelszó", "An error occured while changing your language. Please reload the page and try again." : "Hiba a nyelvváltás közben. Kérlek töltsd újra az oldalt és próbáld meg ismét.", + "An error occured while changing your locale. Please reload the page and try again." : "Hiba a hely váltása közben. Kérlek töltsd újra az oldalt és próbáld meg ismét.", "Select a profile picture" : "Válasszon profilképet!", + "Week starts on {fdow}" : "Hét kezdete {fdow}", "Groups" : "Csoportok", + "Group list is empty" : "Csoport lista üres", + "Unable to retrieve the group list" : "Csoportlista betöltése sikertelen", "Official" : "Hivatalos", + "No results" : "Nincsenek eredmények", "Visit website" : "Weboldal meglátogatása", "User documentation" : "Felhasználói dokumentáció", "Developer documentation" : "Fejlesztői dokumentáció", "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "Ennek az alkalmazásnak nincs minimum szükséges Nextcloud verziója megadva. Ez hiba lesz a jövőben.", "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az alkalmazást nem lehet telepíteni, mert a következő függőségek hiányoznak:", + "{license}-licensed" : "{license}-licencelt", + "Disable all" : "Összes tiltása", "Enable all" : "Mind engedélyezése", + "Download and enable" : "Letöltés és engedélyezés", "Enable" : "Engedélyezés", "The app will be downloaded from the app store" : "Az alkalmazás letöltésre kerül az alkalmazástárból", "Settings" : "Beállítások", + "You do not have permissions to see the details of this user" : "Nincs jogosultságod megnézni ennek a felhasználónak a részleteit.", + "Delete user" : "Felhasználó törlése", + "Disable user" : "Felhasználó tiltása", + "Enable user" : "Felhasználó engedélyezése", + "Resend welcome email" : "Üdvözlő üzenet ismételt küldése", + "Welcome mail sent!" : "Üdvöző üzenet elküldve!", + "Display name" : "Név megjelenítés", "Email" : "E-mail", "Group admin for" : "Csoport Adminisztrátor itt", "Language" : "Nyelv", "User backend" : "Felhasználói háttér", "Unlimited" : "Korlátlan", "Default quota" : "Alapértelmezett kvóta", + "Default language" : "Alapértelmezett nyelv", + "Password change is disabled because the master key is disabled" : "A jelszó változtatása tiltva van mert a mester kulcs tiltva van", + "Common languages" : "Alapvető nyelvek", + "All languages" : "Minden nyelv", "You did not enter the password in time" : "Nem adta meg időben a jelszót", "An error occured during the request. Unable to proceed." : "Hiba lépett fel a kérés közben. Nem lehet végrehajtani.", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Ez az alkalmazás engedélyezve van, de frissíteni kell. A frissítő oldalra irányítjuk 5 másodpercen belül.", "App update" : "Alkalmazás frissítése", "Error: This app can not be enabled because it makes the server unstable" : "Hiba: az alkalmazás nem nem engedélyezhető, mert instabillá tenné a szervert", "Your apps" : "Alkalmazásaid", + "Active apps" : "Aktív alkalmazások", "Disabled apps" : "Letiltott alkalmazások", "Updates" : "Feltöltések", "App bundles" : "Alkalmazás csomagok", + "Default quota :" : "Alapértelmezett kvóta :", + "You are about to remove the group {group}. The users will NOT be deleted." : "A {group} csoportot fodja törölni. A felhasználó NEM fog törlődni.", + "Please confirm the group removal " : "Kérem erősítse meg a csoport törlését", + "Remove group" : "Csoport törlése", "Admins" : "Adminisztrátorok", + "Disabled users" : "Letiltott felhasználók", "Everyone" : "Mindenki", + "New user" : "Új felhasználó", "SSL Root Certificates" : "SSL Root tanusítványok", "Common Name" : "Általános Név", "Valid until" : "Érvényes", @@ -137,6 +164,7 @@ "Valid until %s" : "Érvényes: %s", "Import root certificate" : "Gyökértanúsítvány importálása", "Administrator documentation" : "Adminisztrátori dokumentáció", + "Documentation" : "Dokumentáció", "Forum" : "Fórum", "None" : "Egyik sem", "Login" : "Login", diff --git a/settings/l10n/nb.js b/settings/l10n/nb.js index e95d7fd2060..fcb20f23228 100644 --- a/settings/l10n/nb.js +++ b/settings/l10n/nb.js @@ -189,7 +189,7 @@ OC.L10N.register( "cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert kvarter over HTTP.", "Use system cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert kvarter.", "The cron.php needs to be executed by the system user \"%s\"." : "Filen cron.php må kjøres systemet som følgende bruker \"%s\".", - "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP POSIX extension». Se {linkstart}PHP-dokumentasjonen{linkend} for flere detaljer.", + "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du PHP POSIX utvidelse. Se {linkstart}PHP-dokumentasjonen{linkend} for flere detaljer.", "Sharing" : "Deling", "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Som administrator kan du fininnstille delingsoppførselen. Se dokumentasjonen for mer informasjon.", "Allow apps to use the Share API" : "Tillat programmer å bruke API for deling", @@ -212,7 +212,7 @@ OC.L10N.register( "Default share permissions" : "Standard delingsrettigheter", "Personal" : "Personlig", "Administration" : "Administrasjon", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Utviklet av {communityopen}Nextcloud mijøet{linkclose}, {githubopen}kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", + "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Utviklet av {communityopen}Nextcloud mijøet{linkclose}, {githubopen}kildekoden{linkclose} er lisensiert under {licenseopen}AGPL{linkclose}.", "Follow us on Google+" : "Følg oss på Google+", "Like our Facebook page" : "Lik vår Facebook-side", "Follow us on Twitter" : "Følg oss på Twitter", @@ -342,7 +342,7 @@ OC.L10N.register( "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å utføre cronjob via kommandolinje. Følgende tekniske feil har dukket opp:", "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsmanualer</a>, og se etter feil eller advarsler i <a href=\"%s\">loggen</a>.", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registert i en webcron- tjeneste for å kalle på cron.php hvert 15. minutt over http.", - "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart}PHP dokumentasjonen{linkend} for flere detaljer.", + "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart} PHP dokumentasjonen {linkend} for flere detaljer.", "Tips & tricks" : "Tips og triks", "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Det er mange funksjoner og oppsettsbrytere tilgjengelig for optimal tilpasning og bruk av denne installasjonen. Her har du noen punkter med ytterligere informasjon.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite er for øyeblikket brukt som database. For større installasjoner vil vi anbefale deg å benytte en annen databasetype.", @@ -375,7 +375,7 @@ OC.L10N.register( "Desktop client" : "Skrivebordsklient", "Android app" : "Android-program", "iOS app" : "iOS-program", - "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Hvis du vil støtte prosjektet {contributeopen} delta i utviklingen {linkclose} eller {contributeopen}spre budskapet{linkclose}!", + "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Hvis du vil støtte prosjektet {contributeopen} delta i utviklingen {linkclose} eller {contributeopen} spre budskapet {linkclose}!", "Show First Run Wizard again" : "Vis førstegangsveiviseren på nytt", "Web, desktop, mobile clients and app specific passwords that currently have access to your account." : "Vev, skrivebord og mobil -klienter og programspesifikke passord som har tilgang til kontoen din nå.", "App passwords" : "Programpassord", diff --git a/settings/l10n/nb.json b/settings/l10n/nb.json index cc171285d47..80551473eb5 100644 --- a/settings/l10n/nb.json +++ b/settings/l10n/nb.json @@ -187,7 +187,7 @@ "cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert kvarter over HTTP.", "Use system cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert kvarter.", "The cron.php needs to be executed by the system user \"%s\"." : "Filen cron.php må kjøres systemet som følgende bruker \"%s\".", - "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP POSIX extension». Se {linkstart}PHP-dokumentasjonen{linkend} for flere detaljer.", + "To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du PHP POSIX utvidelse. Se {linkstart}PHP-dokumentasjonen{linkend} for flere detaljer.", "Sharing" : "Deling", "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "Som administrator kan du fininnstille delingsoppførselen. Se dokumentasjonen for mer informasjon.", "Allow apps to use the Share API" : "Tillat programmer å bruke API for deling", @@ -210,7 +210,7 @@ "Default share permissions" : "Standard delingsrettigheter", "Personal" : "Personlig", "Administration" : "Administrasjon", - "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Utviklet av {communityopen}Nextcloud mijøet{linkclose}, {githubopen}kildekoden{linkclose} er lisensiert under {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.", + "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Utviklet av {communityopen}Nextcloud mijøet{linkclose}, {githubopen}kildekoden{linkclose} er lisensiert under {licenseopen}AGPL{linkclose}.", "Follow us on Google+" : "Følg oss på Google+", "Like our Facebook page" : "Lik vår Facebook-side", "Follow us on Twitter" : "Følg oss på Twitter", @@ -340,7 +340,7 @@ "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å utføre cronjob via kommandolinje. Følgende tekniske feil har dukket opp:", "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installasjonsmanualer</a>, og se etter feil eller advarsler i <a href=\"%s\">loggen</a>.", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registert i en webcron- tjeneste for å kalle på cron.php hvert 15. minutt over http.", - "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart}PHP dokumentasjonen{linkend} for flere detaljer.", + "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "For å kjøre denne trenger du «PHP posix extension». Se {linkstart} PHP dokumentasjonen {linkend} for flere detaljer.", "Tips & tricks" : "Tips og triks", "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "Det er mange funksjoner og oppsettsbrytere tilgjengelig for optimal tilpasning og bruk av denne installasjonen. Her har du noen punkter med ytterligere informasjon.", "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite er for øyeblikket brukt som database. For større installasjoner vil vi anbefale deg å benytte en annen databasetype.", @@ -373,7 +373,7 @@ "Desktop client" : "Skrivebordsklient", "Android app" : "Android-program", "iOS app" : "iOS-program", - "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Hvis du vil støtte prosjektet {contributeopen} delta i utviklingen {linkclose} eller {contributeopen}spre budskapet{linkclose}!", + "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Hvis du vil støtte prosjektet {contributeopen} delta i utviklingen {linkclose} eller {contributeopen} spre budskapet {linkclose}!", "Show First Run Wizard again" : "Vis førstegangsveiviseren på nytt", "Web, desktop, mobile clients and app specific passwords that currently have access to your account." : "Vev, skrivebord og mobil -klienter og programspesifikke passord som har tilgang til kontoen din nå.", "App passwords" : "Programpassord", diff --git a/version.php b/version.php index d82cd524e46..373d4c1d921 100644 --- a/version.php +++ b/version.php @@ -29,10 +29,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(14, 0, 0, 16); +$OC_Version = array(14, 0, 0, 17); // The human readable string -$OC_VersionString = '14.0.0 Beta 4'; +$OC_VersionString = '14.0.0 RC 1'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ |