From ef2af3c8bbb2e85edec5b524a83bddbbebc514ef Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Wed, 19 Feb 2020 20:53:56 +0100 Subject: [PATCH 01/72] Lokalise: update of webapp/locales/es.json --- webapp/locales/es.json | 85 ++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/webapp/locales/es.json b/webapp/locales/es.json index e4315734a..f049e5e3f 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -57,11 +57,6 @@ "settings": { "name": "Configuración" }, - "tags": { - "name": "Etiquetas", - "tagCount": "Contribuciones", - "tagCountUnique": "Usuarios" - }, "users": { "empty": "No se han encontrado usuarios", "form": { @@ -134,8 +129,6 @@ "content": { "unavailable-placeholder": "... este comentario ya no está disponible" }, - "delete": "Eliminar comentario", - "edit": "Editar comentario", "edited": "editado", "menu": { "delete": "Borrar comentario", @@ -247,8 +240,6 @@ "just-for-fun": "Sólo por diversión" } }, - "delete": "Eliminar contribución", - "edit": "Editar contribución", "emotions-label": { "angry": "Enfadado", "cry": "Llorar", @@ -258,6 +249,8 @@ }, "filterALL": "Ver todas las contribuciones", "filterFollow": "Filtrar las contribuciones de los usuarios que sigo", + "inappropriatePicture": "Esta imagen puede ser inapropiada para algunas personas.", + "inappropriatePictureText": "¿Cuándo debería estar borrosa mi foto?", "languageSelectLabel": "Idioma", "languageSelectText": "Seleccione el idioma", "newPost": "Crear una nueva contribución", @@ -325,6 +318,17 @@ }, "placeholder": "Deje sus pensamientos inspiradores...." }, + "error-pages": { + "403-default": "No autorizado a esta página", + "404-default": "Esta página no se pudo encontrar", + "500-default": "Error interno del servidor", + "503-default": "Servicio no disponible", + "back-to-index": "Volver a la página de índice", + "cannot-edit-post": "Esta contribución no se puede editar.", + "default": "Se produjo un error", + "post-not-found": "Esta contribución no se pudo encontrar", + "profile-not-found": "Este perfil no se pudo encontrar" + }, "filter-menu": { "clearSearch": "Borrar búsqueda", "hashtag-search": "Buscando a #{hashtag}", @@ -386,7 +390,7 @@ "cancel": "Cancelar", "Comment": { "disable": { - "message": "¿Realmente quiere que el comentario \"{nombre}\" permanezca desactivado?", + "message": "¿Realmente quiere que el comentario \"{name}\" permanezca desactivado?", "title": "Desactivar finalmente Comentario" }, "enable": { @@ -396,22 +400,22 @@ }, "Post": { "disable": { - "message": "¿Realmente quiere que la entrada \"{nombre}\" permanezca desactivada?", + "message": "¿Realmente quiere que la entrada \"{name}\" permanezca desactivada?", "title": "Finalmente Desactivar Contribución" }, "enable": { - "message": "¿Realmente quiere que la contribución \"{nombre}\" permanezca activada?", + "message": "¿Realmente quiere que la contribución \"{name}\" permanezca activada?", "title": "Finalmente Habilitar Contribución" } }, "submit": "Confirmar decisión", "User": { "disable": { - "message": "¿Realmente quiere que el usuario \"{nombre}\" permanezca desactivado?", + "message": "¿Realmente quiere que el usuario \"{name}\" permanezca desactivado?", "title": "Finalmente Deshabilitar Usuario" }, "enable": { - "message": "¿Realmente quiere que el usuario \"{nombre}\" permanezca habilitado?", + "message": "¿Realmente quiere que el usuario \"{name}\" permanezca habilitado?", "title": "Finalmente Habilitar Usuario" } } @@ -439,7 +443,6 @@ "reasonCategory": "Categoría", "reasonDescription": "Descripción", "reportedOn": "Fecha", - "reporter": "reportado por", "status": "Estado actual", "submitter": "comunicado por" } @@ -465,6 +468,7 @@ }, "post": { "comment": { + "reply": "Contestar", "submit": "Comentario", "submitted": "Comentario enviado", "updated": "Cambios guardados" @@ -591,10 +595,36 @@ }, "search": { "failed": "No se ha encontrado nada", + "heading": { + "Post": "Contribuciones", + "User": "Usuarios" + }, "hint": "¿Qué estás buscando?", "placeholder": "Buscar" }, "settings": { + "blocked-users": { + "block": "Bloquear usuario", + "columns": { + "name": "Nombre", + "slug": "Alias", + "unblock": "Desbloquear" + }, + "empty": "Hasta ahora, no ha bloqueado a nadie.", + "explanation": { + "closing": "Esto debería ser suficiente por ahora para que los usuarios bloqueados no puedan molestarle más.", + "commenting-disabled": "No es posible hacer comentarios en este momento en esta contribución", + "commenting-explanation": "Esto puede suceder por varias razones, por favor vea nuestra ", + "intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:", + "notifications": "Los usuarios bloqueados no recibirán más notificaciones si se mencionan en sus contribuciones.", + "their-perspective": "Viceversa: la persona bloqueada tampoco verá más sus contribuciones en sus noticias.", + "your-perspective": "Las contribuciones de la persona bloqueada no aparecerán más en su canal de noticias." + }, + "how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.", + "name": "Usuarios bloqueados", + "unblock": "Desbloquear usuario", + "unblocked": "{name} está desbloqueado nuevamente" + }, "data": { "labelBio": "Acerca de usted", "labelCity": "Su ciudad o región", @@ -604,15 +634,12 @@ "namePlaceholder": "Femanon Funny", "success": "¡Sus datos han sido actualizados con éxito!" }, - "delete": { - "name": "Borrar cuenta" - }, "deleteUserAccount": { "accountDescription": "Tenga en cuenta que su contribución y sus comentarios son importantes para nuestra comunidad. Si aún decide borrarlos, debe marcarlos a continuación.", "accountWarning": "¡ NO PUEDE GESTIONAR y NO PUEDE RECUPERAR su cuenta, contribuciones o comentarios después de eliminar su cuenta!", "commentedCount": "Eliminar mis {count} comentarios", "contributionsCount": "Eliminar mis {count} contribuciones", - "name": "Eliminar cuenta de usuario", + "name": "Borrar datos", "pleaseConfirm": " ¡Acción destructiva! Escriba {confirm} para confirmar", "success": "¡Cuenta eliminada con éxito!" }, @@ -666,19 +693,19 @@ "columns": { "name": "Nombre", "slug": "Alias", - "unmute": "Desbloquear" + "unmute": "Dejar de silenciar" }, - "empty": "Hasta ahora, no ha bloqueado a nadie.", + "empty": "Hasta ahora, no ha silenciado a nadie.", "explanation": { - "intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:", - "search": "Las contribuciones de personas bloqueadas desaparecen de los resultados de búsqueda.", - "your-perspective": "Las contribuciones de la persona bloqueada no aparecerán más en su canal de noticias." + "intro": "Si otro usuario ha sido silenciado por usted, esto es lo que sucede:", + "search": "Las contribuciones de personas silenciadas desaparecen de los resultados de búsqueda.", + "your-perspective": "Las contribuciones de la persona silenciada ya no aparecerán en tu canal de noticias." }, - "how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.", - "mute": "Bloquear usuario", - "name": "Usuarios bloqueados", - "unmute": "Desbloquear usuario", - "unmuted": "{name} está desbloqueado nuevamente" + "how-to": "Puede silenciar a otros usuarios en su página de perfil a través del menú de contenido.", + "mute": "Silenciar usuario", + "name": "Usuarios silenciados", + "unmute": "Dejar de silenciar al usuario", + "unmuted": "{name} no está silenciado ahora" }, "name": "Configuración", "organizations": { From 28e2967119f1b47752afc959a4c3ae741fdad0b0 Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Wed, 19 Feb 2020 20:53:58 +0100 Subject: [PATCH 02/72] Lokalise: update of webapp/locales/fr.json --- webapp/locales/fr.json | 139 +++++++++++++++++++++++++++++------------ 1 file changed, 98 insertions(+), 41 deletions(-) diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index fbe5477a7..93340f912 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -57,11 +57,6 @@ "settings": { "name": "Paramètres" }, - "tags": { - "name": "Étiquettes", - "tagCount": "Postes", - "tagCountUnique": "Utilisateurs" - }, "users": { "empty": "Aucun utilisateur trouvé", "form": { @@ -132,10 +127,8 @@ }, "comment": { "content": { - "unavailable-placeholder": "...ce commentaire n'est plus disponible" + "unavailable-placeholder": "… ce commentaire n'est plus disponible" }, - "delete": "Supprimer le commentaire", - "edit": "Rédiger un commentaire", "edited": "édité", "menu": { "delete": "Supprimer le commentaire", @@ -163,7 +156,7 @@ "takeAction": "Passer à l'action", "user": "Utilisateur ::: Utilisateurs", "validations": { - "categories": "", + "categories": "au moins une et au maximum trois catégories doivent être sélectionnées", "email": "Doit être une adresse mail valide", "url": "doit être une URL valide" }, @@ -205,13 +198,15 @@ "signup": { "form": { "data-privacy": "J'ai lu et compris la Déclaration de confidentialité ", - "description": "Pour commencer, entrez votre adresse mail:", + "description": "Pour commencer, entrez votre adresse mail :", "errors": { "email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!", "invalid-invitation-token": "On dirait que l'invitation a déjà été utilisée. Les liens d'invitation ne peuvent être utilisés qu'une seule fois." }, "invitation-code": "Votre code d'invitation est: {code} ", "minimum-age": "J'ai 18 ans ou plus.", + "no-commercial": "Je n'ai aucun intérêt commercial et je ne représente pas d'entreprise ou toute autre organisation commerciale sur le réseau.", + "no-political": "Je ne parle pas au nom d'un parti ou d'une organisation politique sur le réseau.", "submit": "Créer un compte", "success": "Un mail avec un lien pour compléter votre inscription a été envoyé à {email}", "terms-and-condition": "Je confirme les Conditions générales ." @@ -245,8 +240,6 @@ "just-for-fun": "Juste pour le Fun" } }, - "delete": "Supprimer l'entrée", - "edit": "Rédiger l'apport", "emotions-label": { "angry": "En colère", "cry": "Pleurer", @@ -256,8 +249,10 @@ }, "filterALL": "Voir toutes les contributions", "filterFollow": "Filtrer les contributions des utilisateurs que je suis", + "inappropriatePicture": "Cette image peut être inappropriée pour certaines personnes.", + "inappropriatePictureText": "Quand est ce que ma photo doit-elle être floue", "languageSelectLabel": "Langue", - "languageSelectText": "", + "languageSelectText": "Sélectionner une langue", "newPost": "Créer un nouveau Post", "success": "Enregistré!", "teaserImage": { @@ -376,13 +371,68 @@ "moderation": { "name": "Modération", "reports": { - "createdAt": "Date", + "author": "Auteur", + "content": "Contenu", + "decideButton": "Confirmer", + "decided": "Décidé", + "decideModal": { + "cancel": "Annuler", + "Comment": { + "disable": { + "message": "Voulez-vous vraiment que le commentaire \"{name}\" reste désactivé ?", + "title": "Finalement désactiver le commentaire" + }, + "enable": { + "message": "Voulez-vous vraiment que le commentaire \"{name}\" reste activé?", + "title": "Finalement activer le commentaire" + } + }, + "Post": { + "disable": { + "message": "Voulez-vous vraiment que la publication \"{name}\" reste désactivé?", + "title": "Finalement désactiver la publication" + }, + "enable": { + "message": "Voulez-vous vraiment que la publication \"{name}\" reste activé?", + "title": "Finalement activer le post" + } + }, + "submit": "Confirmer la décision", + "User": { + "disable": { + "message": "Voulez-vous vraiment laisser l'utilisateur \"{name}\" désactivé?", + "title": "Finalement désactiver l'utilisateur" + }, + "enable": { + "message": "Voulez-vous réellement laisser l'utilisateur \"{name}\" activé?", + "title": "Finalement activer utilisateur" + } + } + }, + "decision": "Décision", + "DecisionSuccess": "Décidé avec succès!", + "disabled": "Désactivé", + "disabledAt": "Désactivé le", "disabledBy": "désactivé par", "empty": "Félicitations, rien à modérer.", + "enabled": "Activé", + "enabledAt": "Activé le", + "enabledBy": "Activé par", + "filterLabel": { + "all": "Tous", + "closed": "Fermé", + "reviewed": "Revu", + "unreviewed": "Non révisé" + }, + "moreDetails": "Voir les détails", "name": "Signalisations", + "noDecision": "Pas de décision!", + "numberOfUsers": "{count} utilisateurs", + "previousDecision": "Décision précédente:", "reasonCategory": "Catégorie", "reasonDescription": "Description", - "reporter": "signalé par", + "reportedOn": "Date", + "status": "Statut actuel", "submitter": "signalé par" } }, @@ -509,7 +559,7 @@ "advert_products_services_commercial": "Publicité de produits et de services à des fins commerciaux.", "criminal_behavior_violation_german_law": "Comportement criminel ou violation du droit allemand.", "discrimination_etc": "Posts, commentaires, expressions ou insultes discriminatoires.", - "doxing": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").", + "doxing": "La divulgation de renseignements personnels sans le consentement ou la menace de (\"doxing\").", "glorific_trivia_of_cruel_inhuman_acts": "Glorification ou banalisation d'actes de violence cruels ou inhumains.", "intentional_intimidation_stalking_persecution": "L'intimidation, le harcèlement ou la persécution intentionnelle.", "other": "Autres...", @@ -533,10 +583,34 @@ }, "search": { "failed": "Rien trouvé", + "heading": { + "Post": "Posts", + "User": "Utilisateurs" + }, "hint": "Qu'est-ce que vous cherchez ?", "placeholder": "Rechercher" }, "settings": { + "blocked-users": { + "block": "Bloquer l'utilisateur", + "columns": { + "name": "Nom", + "slug": "Slug", + "unblock": "Débloquer" + }, + "empty": "Jusqu'à présent, vous n'avez bloqué personne.", + "explanation": { + "closing": "Ceci devrait être suffisant pour le moment afin que les utilisateurs bloqués ne puissent plus vous déranger.", + "intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:", + "notifications": "Les utilisateurs bloqués ne recevront plus de notifications s'ils sont mentionnés dans vos postes.", + "their-perspective": "Vice versa: la personne bloquée ne verra plus non plus vos postes dans son fil d'actualités.", + "your-perspective": "Les postes de la personne bloquée n'apparaîtront dans votre fil d'actualités." + }, + "how-to": "Vous pouvez bloquer d'autres utilisateurs sur leur page de profil via le menu de contenu.", + "name": "Utilisateurs bloqués", + "unblock": "Débloquer l'utilisateur", + "unblocked": "{name} est à nouveau débloqué" + }, "data": { "labelBio": "À propos de vous", "labelCity": "Votre ville ou région", @@ -546,15 +620,12 @@ "namePlaceholder": "Fémanon Funny", "success": "Vos données ont été mises à jour avec succès !" }, - "delete": { - "name": "Supprimer un compte" - }, "deleteUserAccount": { "accountDescription": "Sachez que vos postes et commentaires sont importants pour notre communauté. Si vous voulez quand même les supprimer, vous devez les marquer ci-dessous.", "accountWarning": "Vous NE POUVEZ PAS GÉRER et NE POUVEZ PAS RECOUVRIR votre compte, vos messages ou vos commentaires après avoir supprimé votre compte !", "commentedCount": "Supprimer mes {count} commentaires", "contributionsCount": "Supprimer mes {count} postes", - "name": "Supprimer un compte utilisateur", + "name": "Effacer les données", "pleaseConfirm": " Action destructive! Saisissez {confirm} pour confirmer", "success": "Compte supprimer avec succès!" }, @@ -604,32 +675,14 @@ "languages": { "name": "Langues" }, - "muted-users": { - "columns": { - "name": "Nom", - "slug": "Slug", - "unmute": "" - }, - "empty": "Jusqu'à présent, vous n'avez bloqué personne.", - "explanation": { - "intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:", - "search": "Les postes des personnes bloquées disparaissent de vos résultats de recherche.", - "your-perspective": "Les postes de la personne bloquée n'apparaîtront dans votre fil d'actualités." - }, - "how-to": "Vous pouvez bloquer d'autres utilisateurs sur leur page de profil via le menu de contenu.", - "mute": "Bloquer l'utilisateur", - "name": "Utilisateurs bloqués", - "unmute": "Débloquer l'utilisateur", - "unmuted": "{name} est à nouveau débloqué" - }, "name": "Paramètres", "organizations": { "name": "Mes organisations" }, "privacy": { - "make-shouts-public": "", - "name": "", - "success-update": "" + "make-shouts-public": "Partager les articles que j'ai recommandés sur mon profil", + "name": "Confidentialité", + "success-update": "Paramètres de confidentialité enregistrés" }, "security": { "change-password": { @@ -723,6 +776,10 @@ "title": "Modération" }, "newTermsAndConditions": "Nouvelles conditions générales", + "no-commercial-use": { + "description": "L'utilisation du réseau Human Connetion à fin commercial n'est pas autorisée. Cela comprend, sans s'y limiter, la publicité de produits à des fins commerciales, la publication de liens d'affiliation, la sollicitation directe de dons ou l'octroi d'un soutien financier à des fins qui ne sont pas reconnues comme organismes de bienfaisance aux fins de l'impôt.", + "title": "Pas d'utilisation commerciale" + }, "privacy-statement": { "description": "Notre réseau est un réseau de connaissances et d'action sociale. Il est donc particulièrement important pour nous qu'autant de contenu que possible soit accessible au public. Au cours du développement de notre réseau, il y aura de plus en plus la possibilité de décider de la visibilité des données personnelles. Nous vous informerons de ces nouvelles fonctionnalités. Sinon, vous devriez toujours penser aux données personnelles que vous divulguez à votre sujet (ou à celui d'autres personnes). Cela vaut en particulier pour le contenu des messages et des commentaires, qui ont un caractère largement public. Plus tard, il y aura des possibilités de limiter la visibilité de votre profil. Une partie des conditions d'utilisation est notre déclaration de confidentialité, qui vous informe sur les différentes opérations de traitement des données dans notre réseau: https://human-connection.org/datenschutz/#netzwerk ex: https://human-connection.org/datenschutz/ Notre déclaration de confidentialité est adaptée à la situation juridique et aux caractéristiques de notre réseau et est toujours valable dans la version la plus récente.", "title": "Déclaration de confidentialité" From e1c8b7a6668f528e64ddecdd90f9fdd68ba1dacd Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Wed, 19 Feb 2020 20:54:00 +0100 Subject: [PATCH 03/72] Lokalise: update of webapp/locales/pt.json --- webapp/locales/pt.json | 52 ++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 5da36dfe9..4f4b70592 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -57,11 +57,6 @@ "settings": { "name": "Configurações" }, - "tags": { - "name": "Etiquetas", - "tagCount": "Postagens", - "tagCountUnique": "Usuários" - }, "users": { "empty": "Nenhum usuário encontrado", "form": { @@ -134,8 +129,6 @@ "content": { "unavailable-placeholder": "…esse comentário não está mais disponível" }, - "delete": "Apagar Comentário", - "edit": "Editar Comentário", "edited": "editado", "menu": { "delete": "Apagar Comentário", @@ -245,8 +238,6 @@ "just-for-fun": "Só por diversão" } }, - "delete": "Apagar Contribuição", - "edit": "Editar Contribuição", "emotions-label": { "angry": "Irritado", "cry": "Chorando", @@ -376,13 +367,11 @@ "moderation": { "name": "Moderação", "reports": { - "createdAt": "Data", "disabledBy": "desativado por", "empty": "Parabéns, nada a moderar.", "name": "Denúncias", "reasonCategory": "Categoria", "reasonDescription": "Descrição", - "reporter": "Denunciado por", "submitter": "denunciado por" } }, @@ -537,6 +526,26 @@ "placeholder": "Buscar" }, "settings": { + "blocked-users": { + "block": "Bloquear usuário", + "columns": { + "name": "Nome", + "slug": "Slug", + "unblock": "Desbloquear" + }, + "empty": "Até agora, você não bloqueou ninguém.", + "explanation": { + "closing": "Isso deve ser suficiente por enquanto para que os usuários bloqueados não possam mais incomodá-lo.", + "intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:", + "notifications": "Usuários bloqueados não receberão mais notificações se forem mencionados em suas mensagens.", + "their-perspective": "Vice versa: A pessoa bloqueada também não verá mais suas mensagens em seu feed de notícias.", + "your-perspective": "As mensagens da pessoa bloqueada não aparecerão mais no seu feed de notícias." + }, + "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.", + "name": "Usuários bloqueados", + "unblock": "Desbloquear usuário", + "unblocked": "{name} está desbloqueado novamente" + }, "data": { "labelBio": "Sobre você", "labelCity": "Sua cidade ou estado", @@ -546,9 +555,6 @@ "namePlaceholder": "Anonymous", "success": "Seus dados foram atualizados com sucesso!" }, - "delete": { - "name": "Apagar conta" - }, "deleteUserAccount": { "accountDescription": "Esteja ciente de que o suas Publicações e Comentários são importantes para a nossa comunidade. Se você ainda optar por excluí-los, você tem que marcá-los abaixo.", "accountWarning": "Você NÃO PODE GERENCIAR e NÃO PODE RECUPERAR sua conta, Publicações, ou Comentários após excluir sua conta!", @@ -604,24 +610,6 @@ "languages": { "name": "Idiomas" }, - "muted-users": { - "columns": { - "name": "Nome", - "slug": "Slug", - "unmute": "Desbloquear" - }, - "empty": "Até agora, você não bloqueou ninguém.", - "explanation": { - "intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:", - "search": "Publicações de pessoas bloqueadas desaparecem dos resultados da sua pesquisa.", - "your-perspective": "As mensagens da pessoa bloqueada não aparecerão mais no seu feed de notícias." - }, - "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.", - "mute": "Bloquear usuário", - "name": "Usuários bloqueados", - "unmute": "Desbloquear usuário", - "unmuted": "{name} está desbloqueado novamente" - }, "name": "Configurações", "organizations": { "name": "Minhas Organizações" From c4c6c7e7110d5eeefa8a8e1a71d8d59bb5adf29c Mon Sep 17 00:00:00 2001 From: lokalise-bot Date: Wed, 19 Feb 2020 20:54:02 +0100 Subject: [PATCH 04/72] Lokalise: update of webapp/locales/ru.json --- webapp/locales/ru.json | 63 +++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 97eaff8f1..d69608648 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -57,11 +57,6 @@ "settings": { "name": "Настройки" }, - "tags": { - "name": "Теги", - "tagCount": "Посты", - "tagCountUnique": "Пользователи" - }, "users": { "empty": "Пользователи не найдены", "form": { @@ -134,8 +129,6 @@ "content": { "unavailable-placeholder": "...этот комментарий больше не доступен" }, - "delete": "Удалить комментарий", - "edit": "Редактировать комментарий", "edited": "Изменен", "menu": { "delete": "Удалить комментарий", @@ -247,8 +240,6 @@ "just-for-fun": "Просто для удовольствия" } }, - "delete": "Удалить", - "edit": "Редактировать", "emotions-label": { "angry": "Возмутительно", "cry": "Плачу", @@ -258,6 +249,8 @@ }, "filterALL": "Просмотреть все посты", "filterFollow": "Показать сообщения пользователей, на которых я подписан", + "inappropriatePicture": "Эта картинка может быть неуместным для некоторых людей.", + "inappropriatePictureText": "Когда моя картинка должна быть размыта", "languageSelectLabel": "Язык", "languageSelectText": "Выберите язык", "newPost": "Создать пост", @@ -325,6 +318,10 @@ }, "placeholder": "Поделитесь своими вдохновляющими мыслями ..." }, + "error-pages": { + "500-default": "Внутренняя Ошибка Сервера", + "503-default": "Сервис недоступен" + }, "filter-menu": { "clearSearch": "Очистить поиск", "hashtag-search": "Поиск по #{hashtag}", @@ -386,7 +383,7 @@ "cancel": "Отменить", "Comment": { "disable": { - "message": "Вы действительно хотите, чтобы комментарий \"{name}\" остановиться и отключен?", + "message": "Вы действительно хотите, оставить комментарий \"{name}\" отключеным?", "title": "Окончательно отключить комментарий" }, "enable": { @@ -439,7 +436,6 @@ "reasonCategory": "Категория", "reasonDescription": "Описание", "reportedOn": "Дата", - "reporter": "Сообщил(а)", "status": "Текущее состояние", "submitter": "Сообщил(а)" } @@ -465,6 +461,7 @@ }, "post": { "comment": { + "reply": "Ответ", "submit": "Комментировать", "submitted": "Комментарий отправлен", "updated": "Изменения сохраненные" @@ -591,10 +588,34 @@ }, "search": { "failed": "Ничего не найдено", + "heading": { + "Post": "Посты", + "User": "Пользователи" + }, "hint": "Что вы хотите найти?", "placeholder": "Поиск" }, "settings": { + "blocked-users": { + "block": "Блокировать", + "columns": { + "name": "Имя", + "slug": "Псевдоним", + "unblock": "Разблокировать" + }, + "empty": "Вы пока никого не блокировали.", + "explanation": { + "closing": "На данный момент этого должно быть достаточно, чтобы заблокированные пользователи больше вас не беспокоили.", + "intro": "Если блокируете другого пользователя, происходит следующее:", + "notifications": "Заблокированные пользователи больше не будут получать уведомления об упоминаниях в ваших постах.", + "their-perspective": "И наоборот — заблокированный пользователь больше не видит ваши посты в своей ленте.", + "your-perspective": "Посты заблокированного пользователя не отображаются в персональной ленте." + }, + "how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.", + "name": "Заблокированные пользователи", + "unblock": "Разблокировать пользователей", + "unblocked": "{name} - снова разблокирован" + }, "data": { "labelBio": "О себе", "labelCity": "Город или регион", @@ -604,9 +625,6 @@ "namePlaceholder": "Маша Медведева", "success": "Персональные данные были успешно обновлены!" }, - "delete": { - "name": "Удалить аккаунт" - }, "deleteUserAccount": { "accountDescription": "Обратите внимание, что ваши посты и комментарии важны для сообщества. Если вы все равно хотите их удалить, то вы должны отметить соответствующие опции ниже.", "accountWarning": "Вы НЕ СМОЖЕТЕ восстановить свой аккаунт, посты или комментарии после удаления.", @@ -664,21 +682,8 @@ }, "muted-users": { "columns": { - "name": "Имя", - "slug": "Псевдоним", - "unmute": "Разблокировать" - }, - "empty": "Вы пока никого не блокировали.", - "explanation": { - "intro": "Если блокируете другого пользователя, происходит следующее:", - "search": "Посты заблокированных пользователей не отображаются в результатах поиска.", - "your-perspective": "Посты заблокированного пользователя не отображаются в персональной ленте." - }, - "how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.", - "mute": "Блокировать", - "name": "Заблокированные пользователи", - "unmute": "Разблокировать пользователей", - "unmuted": "{name} - снова разблокирован" + "name": "Имя" + } }, "name": "Настройки", "organizations": { From 61cd799df6d6e393c0fb9e109e67e8b4ea81d367 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:16:26 +0000 Subject: [PATCH 05/72] build(deps): bump metascraper-video from 5.10.7 to 5.11.1 in /backend Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14d3f5d47..a68a7b806 100644 --- a/backend/package.json +++ b/backend/package.json @@ -83,7 +83,7 @@ "metascraper-soundcloud": "^5.11.4", "metascraper-title": "^5.10.7", "metascraper-url": "^5.10.7", - "metascraper-video": "^5.10.7", + "metascraper-video": "^5.11.1", "metascraper-youtube": "^5.11.1", "migrate": "^1.6.2", "minimatch": "^3.0.4", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4845e71d4..2a534e3f3 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -6293,12 +6293,12 @@ metascraper-url@^5.10.7: dependencies: "@metascraper/helpers" "^5.10.7" -metascraper-video@^5.10.7: - version "5.10.7" - resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.10.7.tgz#2892819a3613ddac115ada7fb1b28d74a646f974" - integrity sha512-+fjiL/Vq0DGd7dMvBTdFKrOK2YH2myHssSChRZVZLl3gzyo4YEWpnOWBhfuoky0caOcs9+RVAxF9pE1TdTFmbA== +metascraper-video@^5.11.1: + version "5.11.1" + resolved "https://registry.yarnpkg.com/metascraper-video/-/metascraper-video-5.11.1.tgz#4018a635d816f3123c7ba97fe7669e4d61af2196" + integrity sha512-g8x6R4ntX7pt7ntuRCzL1+xIRd0JFAp/LoVPYFvdwn/D78u9GMJi+JvrNuLIEcrmtb6re6rE9MIOy8qMo1g3qA== dependencies: - "@metascraper/helpers" "^5.10.7" + "@metascraper/helpers" "^5.11.1" lodash "~4.17.15" metascraper-youtube@^5.11.1: From 137049d4c376219f654ba7777b2a71de4b442465 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:16:53 +0000 Subject: [PATCH 06/72] build(deps): bump nodemailer from 6.4.2 to 6.4.3 in /backend Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/nodemailer/nodemailer/releases) - [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodemailer/nodemailer/compare/v6.4.2...v6.4.3) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14d3f5d47..4aba4abd3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -92,7 +92,7 @@ "neo4j-graphql-js": "^2.11.5", "neode": "^0.3.7", "node-fetch": "~2.6.0", - "nodemailer": "^6.4.2", + "nodemailer": "^6.4.3", "nodemailer-html-to-text": "^3.1.0", "npm-run-all": "~4.1.5", "request": "~2.88.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4845e71d4..b4a2bf573 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -6665,10 +6665,10 @@ nodemailer-html-to-text@^3.1.0: dependencies: html-to-text "^5.1.1" -nodemailer@^6.4.2: - version "6.4.2" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.2.tgz#7147550e32cdc37453380ab78d2074533966090a" - integrity sha512-g0n4nH1ONGvqYo1v72uSWvF/MRNnnq1LzmSzXb/6EPF3LFb51akOhgG3K2+aETAsJx90/Q5eFNTntu4vBCwyQQ== +nodemailer@^6.4.3: + version "6.4.3" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.4.3.tgz#10d29195fb020e3297495bcba39d3519b23483f3" + integrity sha512-zmx4MTzYWQo2abFexvFYVURaiBGLekoA/yjP2Ctigd82hYtC4n38pcphQBi805t7AB2sY6DwmxnP/tb77f3KHA== nodemon@~2.0.2: version "2.0.2" From 03b08680e0277df17464c272ae2f6b70e4e366bc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:17:22 +0000 Subject: [PATCH 07/72] build(deps): bump sanitize-html from 1.21.1 to 1.22.0 in /backend Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.21.1 to 1.22.0. - [Release notes](https://github.com/punkave/sanitize-html/releases) - [Changelog](https://github.com/apostrophecms/sanitize-html/blob/1.22.0/CHANGELOG.md) - [Commits](https://github.com/punkave/sanitize-html/compare/1.21.1...1.22.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 74 ++++++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 25 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14d3f5d47..ac976d5e8 100644 --- a/backend/package.json +++ b/backend/package.json @@ -96,7 +96,7 @@ "nodemailer-html-to-text": "^3.1.0", "npm-run-all": "~4.1.5", "request": "~2.88.2", - "sanitize-html": "~1.21.1", + "sanitize-html": "~1.22.0", "slug": "~2.1.1", "subscriptions-transport-ws": "^0.9.16", "trunc-html": "~1.1.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4845e71d4..0ebc28cb9 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2125,11 +2125,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-uniq@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" @@ -3346,6 +3341,14 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + dom-serializer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" @@ -3378,6 +3381,13 @@ domhandler@^2.3.0: dependencies: domelementtype "1" +domhandler@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz#51cd13efca31da95bbb0c5bee3a48300e333b3e9" + integrity sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw== + dependencies: + domelementtype "^2.0.1" + domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -3394,6 +3404,15 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" +domutils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz#15b8278e37bfa8468d157478c58c367718133c08" + integrity sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg== + dependencies: + dom-serializer "^0.2.1" + domelementtype "^2.0.1" + domhandler "^3.0.0" + dont-sniff-mimetype@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2" @@ -4740,7 +4759,7 @@ html-to-text@^5.1.1: lodash "^4.17.11" minimist "^1.2.0" -htmlparser2@^3.10.0, htmlparser2@^3.10.1, htmlparser2@^3.9.1: +htmlparser2@^3.10.1, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -4752,6 +4771,16 @@ htmlparser2@^3.10.0, htmlparser2@^3.10.1, htmlparser2@^3.9.1: inherits "^2.0.1" readable-stream "^3.1.1" +htmlparser2@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78" + integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q== + dependencies: + domelementtype "^2.0.1" + domhandler "^3.0.0" + domutils "^2.0.0" + entities "^2.0.0" + http-cache-semantics@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5" @@ -7258,10 +7287,10 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss@^7.0.5: - version "7.0.17" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f" - integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ== +postcss@^7.0.27: + version "7.0.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9" + integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -7868,20 +7897,20 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@~1.21.1: - version "1.21.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz#1647d15c0c672901aa41eac1b86d0c38146d30ce" - integrity sha512-W6enXSVphVaVbmVbzVngBthR5f5sMmhq3EfPfBlzBzp2WnX8Rnk7NGpP7KmHUc0Y3MVk9tv/+CbpdHchX9ai7g== +sanitize-html@~1.22.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz#9df779c53cf5755adb2322943c21c1c1dffca7bf" + integrity sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A== dependencies: chalk "^2.4.1" - htmlparser2 "^3.10.0" + htmlparser2 "^4.1.0" lodash.clonedeep "^4.5.0" lodash.escaperegexp "^4.1.2" lodash.isplainobject "^4.0.6" lodash.isstring "^4.0.1" lodash.mergewith "^4.6.1" - postcss "^7.0.5" - srcset "^1.0.0" + postcss "^7.0.27" + srcset "^2.0.1" xtend "^4.0.1" sax@>=0.6.0, sax@^1.2.4: @@ -8194,13 +8223,10 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -srcset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef" - integrity sha1-pWad4StC87HV6D7QPHEEb8SPQe8= - dependencies: - array-uniq "^1.0.2" - number-is-nan "^1.0.0" +srcset@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz#8f842d357487eb797f413d9c309de7a5149df5ac" + integrity sha512-00kZI87TdRKwt+P8jj8UZxbfp7mK2ufxcIMWvhAOZNJTRROimpHeruWrGvCZneiuVDLqdyHefVp748ECTnyUBQ== sshpk@^1.7.0: version "1.16.1" From 8ba6df9abdf08afe14a11d15e988b6a71bbfb646 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:17:50 +0000 Subject: [PATCH 08/72] build(deps-dev): bump eslint-plugin-jest in /backend Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.7.0 to 23.8.0. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.7.0...v23.8.0) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14d3f5d47..fc1c52615 100644 --- a/backend/package.json +++ b/backend/package.json @@ -122,7 +122,7 @@ "eslint-config-prettier": "~6.10.0", "eslint-config-standard": "~14.1.0", "eslint-plugin-import": "~2.20.1", - "eslint-plugin-jest": "~23.7.0", + "eslint-plugin-jest": "~23.8.0", "eslint-plugin-node": "~11.0.0", "eslint-plugin-prettier": "~3.1.2", "eslint-plugin-promise": "~4.2.1", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4845e71d4..f8a29d264 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3653,10 +3653,10 @@ eslint-plugin-import@~2.20.1: read-pkg-up "^2.0.0" resolve "^1.12.0" -eslint-plugin-jest@~23.7.0: - version "23.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.7.0.tgz#84d5603b6e745b59898cb6750df6a44782a39b04" - integrity sha512-zkiyGlvJeHNjAEz8FaIxTXNblJJ/zj3waNbYbgflK7K6uy0cpE5zJBt/JpJtOBGM/UGkC6BqsQ4n0y7kQ2HA8w== +eslint-plugin-jest@~23.8.0: + version "23.8.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.8.0.tgz#c978f959fa8395801742d13c5a3125a986d2661e" + integrity sha512-DKXmLxguZ1Lru4u5YM12ko3WLq6gqo7dhV2b63K731+/PNyZ/Ff6NGONQsGUtPLG9zU3kdz/N+2LTbweNZifeg== dependencies: "@typescript-eslint/experimental-utils" "^2.5.0" From d89a082d20f9e507943844a038bb7cfa0ee513cb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 04:19:32 +0000 Subject: [PATCH 09/72] build(deps): bump metascraper-description in /backend Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/microlinkhq/metascraper/releases) - [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md) - [Commits](https://github.com/microlinkhq/metascraper/compare/v5.11.0...v5.11.1) Signed-off-by: dependabot-preview[bot] --- backend/package.json | 2 +- backend/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 14d3f5d47..fc4148300 100644 --- a/backend/package.json +++ b/backend/package.json @@ -74,7 +74,7 @@ "metascraper-author": "^5.11.1", "metascraper-clearbit-logo": "^5.3.0", "metascraper-date": "^5.11.1", - "metascraper-description": "^5.11.0", + "metascraper-description": "^5.11.1", "metascraper-image": "^5.11.1", "metascraper-lang": "^5.11.1", "metascraper-lang-detector": "^4.10.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 4845e71d4..452a75ccc 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -6226,12 +6226,12 @@ metascraper-date@^5.11.1: dependencies: "@metascraper/helpers" "^5.11.1" -metascraper-description@^5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.11.0.tgz#1f7edfae7ffc353512975cafaa5b862fc5141709" - integrity sha512-or62L9EbIwBxjsu6gShTKi1z1XQ4Hvml8MrdydL4tiSUJpwf+lXc6gVOP8+nlKPPRkiAhXt2M9k4mfkGoX0erQ== +metascraper-description@^5.11.1: + version "5.11.1" + resolved "https://registry.yarnpkg.com/metascraper-description/-/metascraper-description-5.11.1.tgz#55a90f165e73dae9289fb922e5269f902cc57d6b" + integrity sha512-xClk2kxYYeAY5yHgrUXQXiSz8I6qa3JNPietWIk4dtUQ+DxHyUOBo6B6pQmlbfX/BjCLh35m0srAqzZ7+r1s2g== dependencies: - "@metascraper/helpers" "^5.10.7" + "@metascraper/helpers" "^5.11.1" metascraper-image@^5.11.1: version "5.11.1" From 21eae3dcd2377678036e03646e9c5d1fa382aac9 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Mon, 24 Feb 2020 22:22:51 +0100 Subject: [PATCH 10/72] refactor ribbon css --- webapp/assets/_new/styles/tokens.scss | 2 ++ webapp/components/Ribbon/index.vue | 35 +++++++++------------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss index 4ab30177b..9e86b3c70 100644 --- a/webapp/assets/_new/styles/tokens.scss +++ b/webapp/assets/_new/styles/tokens.scss @@ -132,6 +132,7 @@ $border-size-x-large: 6px; $border-radius-x-large: 5px; $border-radius-large: 4px; $border-radius-base: 4px; +$border-radius-small: 2px; $border-radius-rounded: 2em; $border-radius-circle: 50%; @@ -240,6 +241,7 @@ $size-height-large: 50px; $size-height-xlarge: 60px; $size-height-footer: 64px; $size-tappable-square: 44px; +$size-ribbon: 6px; /** * @tokens Size Width diff --git a/webapp/components/Ribbon/index.vue b/webapp/components/Ribbon/index.vue index 7be3b040d..f54b456e5 100644 --- a/webapp/components/Ribbon/index.vue +++ b/webapp/components/Ribbon/index.vue @@ -1,7 +1,7 @@