rel="me" attribute. The text content of the link does not matter. Here is an example:'
verification: Verification
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index d4ac238d0..019887bb8 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -730,7 +730,7 @@ es-AR:
aliases:
add_new: Crear alias
created_msg: El nuevo alias se creó exitosamente. Ahora podés empezar la mudanza desde la cuenta vieja.
- deleted_msg: Eliminaste el alias exitosamente. La mudanza de esa cuenta a esta ya no será posible.
+ deleted_msg: Eliminaste el alias exitosamente. La mudanza de esa cuenta a ésta ya no será posible.
empty: No tenés alias.
hint_html: Si querés mudarte desde otra cuenta a esta, acá podés crear un alias, el cual es necesario antes de empezar a mudar seguidores de la cuenta vieja a ésta. Esta acción por sí misma es inofensiva y reversible. La migración de la cuenta se inicia desde la cuenta anterior.
remove: Desvincular alias
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 0890512e8..a7dc45892 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -7,6 +7,7 @@ es-MX:
active_count_after: activo
active_footnote: Usuarios Activos Mensuales (UAM)
administered_by: 'Administrado por:'
+ api: API
apps: Aplicaciones móviles
apps_platforms: Utiliza Mastodon desde iOS, Android y otras plataformas
browse_directory: Navega por el directorio de perfiles y filtra por intereses
@@ -14,6 +15,7 @@ es-MX:
browse_public_posts: Navega por un transmisión en vivo de publicaciones públicas en Mastodon
contact: Contacto
contact_missing: No especificado
+ contact_unavailable: No disponible
discover_users: Descubrir usuarios
documentation: Documentación
federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
@@ -80,6 +82,7 @@ es-MX:
posts_with_replies: Toots con respuestas
roles:
admin: Administrador
+ bot: Bot
group: Grupo
moderator: Moderador
unavailable: Perfil no disponible
@@ -99,6 +102,7 @@ es-MX:
approve_all: Aprobar todos
approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
are_you_sure: "¿Estás seguro?"
+ avatar: Avatar
by_domain: Dominio
change_email:
changed_msg: "¡El correo electrónico se ha actualizado correctamente!"
@@ -131,9 +135,11 @@ es-MX:
inbox_url: URL de la bandeja de entrada
invite_request_text: Razones para unirse
invited_by: Invitado por
+ ip: IP
joined: Unido
location:
all: Todos
+ local: Local
remote: Remoto
title: Localización
login_status: Estado del login
@@ -210,6 +216,7 @@ es-MX:
username: Nombre de usuario
view_domain: Ver resumen del dominio
warn: Adevertir
+ web: Web
whitelisted: Añadido a la lista blanca
action_logs:
action_types:
@@ -223,6 +230,7 @@ es-MX:
create_domain_block: Crear Bloqueo de Dominio
create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
create_ip_block: Crear regla IP
+ create_unavailable_domain: Crear Dominio No Disponible
demote_user: Degradar Usuario
destroy_announcement: Eliminar Anuncio
destroy_custom_emoji: Eliminar Emoji Personalizado
@@ -231,6 +239,7 @@ es-MX:
destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
destroy_ip_block: Eliminar regla IP
destroy_status: Eliminar Estado
+ destroy_unavailable_domain: Eliminar Dominio No Disponible
disable_2fa_user: Deshabilitar 2FA
disable_custom_emoji: Deshabilitar Emoji Personalizado
disable_user: Deshabilitar Usuario
@@ -264,6 +273,7 @@ es-MX:
create_domain_block_html: "%{name} bloqueó el dominio %{target}"
create_email_domain_block_html: "%{name} bloqueó el dominio de correo electrónico %{target}"
create_ip_block_html: "%{name} creó una regla para la IP %{target}"
+ create_unavailable_domain_html: "%{name} detuvo las entregas al dominio %{target}"
demote_user_html: "%{name} degradó al usuario %{target}"
destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
destroy_custom_emoji_html: "%{name} destruyó emoji %{target}"
@@ -272,6 +282,7 @@ es-MX:
destroy_email_domain_block_html: "%{name} desbloqueó el dominio de correo electrónico %{target}"
destroy_ip_block_html: "%{name} eliminó una regla para la IP %{target}"
destroy_status_html: "%{name} eliminó el estado por %{target}"
+ destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
disable_user_html: "%{name} deshabilitó el inicio de sesión para el usuario %{target}"
@@ -313,7 +324,7 @@ es-MX:
scheduled_for: Programado para %{time}
scheduled_msg: "¡Anuncio programado para su publicación!"
title: Anuncios
- unpublish: Eliminar publicación
+ unpublish: Retirar publicación
unpublished_msg: "¡Anuncio despublicado con éxito!"
updated_msg: "¡Anuncio actualizado con éxito!"
custom_emojis:
@@ -329,6 +340,7 @@ es-MX:
disable: Deshabilitar
disabled: Desactivado
disabled_msg: Se deshabilitó con éxito ese emoji
+ emoji: Emoji
enable: Habilitar
enabled: Activado
enabled_msg: Se habilitó con éxito ese emoji
@@ -366,6 +378,7 @@ es-MX:
recent_users: Usuarios recientes
search: Búsqueda por texto completo
single_user_mode: Modo único usuario
+ software: Software
space: Uso de almacenamiento
title: Tablero
total_users: usuarios en total
@@ -434,16 +447,33 @@ es-MX:
title: Nueva entrada en la lista negra de correo
title: Lista negra de correo
follow_recommendations:
- description_html: "Las recomendaciones de cuentas a las que seguir ayudan a los nuevos usuarios a encontrar rápidamente contenido interesante. Cuando un usuario no ha interactuado con otros lo suficiente como para formar recomendaciones personalizadas de seguimiento, estas cuentas se recomiendan en su lugar. Se recalculan diariamente a partir de una mezcla de cuentas con las interacciones más recientes y el mayor número de seguidores para un idioma determinado."
+ description_html: "Las recomendaciones de cuentas ayudan a los nuevos usuarios a encontrar rápidamente contenido interesante. Cuando un usuario no ha interactuado con otros lo suficiente como para suscitar recomendaciones personalizadas de cuentas a las que seguir, en su lugar se le recomiendan estas cuentas. Se recalculan diariamente a partir de una mezcla de cuentas con el mayor número de interacciones recientes y con el mayor número de seguidores locales con un idioma determinado."
language: Para el idioma
status: Estado
- suppress: Eliminar recomendación de cuentas a las que seguir
- suppressed: Eliminado
- title: Recomendaciones de cuentas a las que seguir
- unsuppress: Restaurar recomendaciones de cuentas a las que seguir
+ suppress: Suprimir recomendación de cuentas
+ suppressed: Suprimida
+ title: Recomendaciones de cuentas
+ unsuppress: Restaurar recomendaciones de cuentas
instances:
+ back_to_all: Todos
+ back_to_limited: Limitados
+ back_to_warning: Advertencia
by_domain: Dominio
+ delivery:
+ all: Todos
+ clear: Limpiar errores de entrega
+ restart: Reiniciar entrega
+ stop: Detener entrega
+ title: Entrega
+ unavailable: No disponible
+ unavailable_message: Entrega no disponible
+ warning: Advertencia
+ warning_message:
+ one: Fallo de entrega %{count} día
+ other: Fallo de entrega %{count} días
delivery_available: Entrega disponible
+ delivery_error_days: Días de error de entrega
+ delivery_error_hint: Si la entrega no es posible a lo largo de %{count} días, se marcará automáticamente como no entregable.
empty: No se encontraron dominios.
known_accounts:
one: "%{count} cuenta conocida"
@@ -546,9 +576,9 @@ es-MX:
rules:
add_new: Añadir norma
delete: Eliminar
- description_html: Aunque la mayoría de las afirmaciones de haber leído y aceptado los términos de servicio, normalmente la gente no los lee hasta después de que surja un problema. Haz que sea más fácil ver las reglas de tu servidor de un vistazo, proporcionándolas en una lista de puntos. Intenta mantener reglas individuales cortas y sencillas, pero intenta no dividirlas en muchos objetos separados.
+ description_html: Aunque la mayoría afirma haber leído y estar de acuerdo con los términos de servicio, la gente normalmente no los lee hasta después de que surja algún problema. Haz que sea más fácil ver las normas de tu servidor de un vistazo estipulándolas en una lista de puntos. Intenta que cada norma sea corta y sencilla, pero sin estar divididas en muchos puntos.
edit: Editar norma
- empty: Aún no se han definido reglas del servidor.
+ empty: Aún no se han definido las normas del servidor.
title: Normas del servidor
settings:
activity_api_enabled:
@@ -671,6 +701,7 @@ es-MX:
last_active: Última actividad
most_popular: Más popular
most_recent: Más reciente
+ name: Hashtag
review: Estado de revisión
reviewed: Revisado
title: Etiquetas
@@ -683,7 +714,7 @@ es-MX:
add_new: Añadir nuevo
delete: Borrar
edit_preset: Editar aviso predeterminado
- empty: Aún no ha definido ninguna advertencia predefinida.
+ empty: Aún no has definido ningún preajuste de advertencia.
title: Editar configuración predeterminada de avisos
admin_mailer:
new_pending_account:
@@ -717,6 +748,7 @@ es-MX:
toot_layout: Diseño de los toots
application_mailer:
notification_preferences: Cambiar preferencias de correo electrónico
+ salutation: "%{name}:"
settings: 'Cambiar preferencias de correo: %{link}'
view: 'Vista:'
view_profile: Ver perfil
@@ -751,6 +783,9 @@ es-MX:
migrate_account: Mudarse a otra cuenta
migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes configurarlo aquí.
or_log_in_with: O inicia sesión con
+ providers:
+ cas: CAS
+ saml: SAML
register: Registrarse
registration_closed: "%{instance} no está aceptando nuevos miembros"
resend_confirmation: Volver a enviar el correo de confirmación
@@ -791,15 +826,24 @@ es-MX:
errors:
invalid_key: no es una clave Ed25519 o Curve25519 válida
invalid_signature: no es una firma Ed25519 válida
+ date:
+ formats:
+ default: "%d %b %Y"
+ with_month_name: "%d %B %Y"
datetime:
distance_in_words:
+ about_x_hours: "%{count} h"
about_x_months: "%{count}m"
about_x_years: "%{count}a"
almost_x_years: "%{count}a"
half_a_minute: Justo ahora
+ less_than_x_minutes: "%{count} m"
less_than_x_seconds: Justo ahora
over_x_years: "%{count}a"
+ x_days: "%{count} d"
+ x_minutes: "%{count} m"
x_months: "%{count}m"
+ x_seconds: "%{count} s"
deletes:
challenge_not_passed: Los datos introducidos son incorrectos
confirm_password: Ingresa tu contraseña actual para demostrar tu identidad
@@ -851,6 +895,7 @@ es-MX:
size: Tamaño
blocks: Personas que has bloqueado
bookmarks: Marcadores
+ csv: CSV
domain_blocks: Bloqueos de dominios
lists: Listas
mutes: Tienes en silencio
@@ -1046,8 +1091,13 @@ es-MX:
number:
human:
decimal_units:
+ format: "%n %u"
units:
+ billion: MM
+ million: M
+ quadrillion: MB
thousand: m
+ trillion: B
otp_authentication:
code_hint: Introduce el código generado por tu aplicación de autentificación para confirmar
description_html: Si habilitas autenticación de dos factores a través de una aplicación de autenticación, el ingreso requerirá que estés en posesión de tu teléfono, que generará códigos para que ingreses.
@@ -1061,6 +1111,7 @@ es-MX:
next: Próximo
older: Más antiguo
prev: Anterior
+ truncate: "…"
polls:
errors:
already_voted: Ya has votado en esta encuesta
@@ -1122,15 +1173,40 @@ es-MX:
activity: Última actividad
browser: Navegador
browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ electron: Electron
+ firefox: Firefox
generic: Desconocido
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
nokia: Navegador de Nokia S40 Ovi
+ opera: Opera
+ otter: Otter
+ phantom_js: PhantomJS
qq: Navegador QQ
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
current_session: Sesión actual
description: "%{browser} en %{platform}"
explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
+ ip: IP
platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: GNU Linux
mac: Mac
other: Desconocido
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
revoke: Revocar
revoke_success: Sesión revocada exitosamente
title: Sesiones
@@ -1158,6 +1234,9 @@ es-MX:
webauthn_authentication: Claves de seguridad
statuses:
attached:
+ audio:
+ one: "%{count} audio"
+ other: "%{count} audios"
description: 'Adjunto: %{attached}'
image:
one: "%{count} imagen"
@@ -1193,8 +1272,9 @@ es-MX:
show_older: Mostrar más antiguos
show_thread: Mostrar discusión
sign_in_to_participate: Regístrate para participar en la conversación
+ title: "%{name}: «%{quote}»"
visibilities:
- direct: Directo
+ direct: Directa
private: Sólo mostrar a seguidores
private_long: Solo mostrar a tus seguidores
public: Público
@@ -1297,6 +1377,7 @@ es-MX:
time:
formats:
default: "%d de %b del %Y, %H:%M"
+ month: "%b %Y"
two_factor_authentication:
add: Añadir
disable: Deshabilitar
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0f8984863..9f2f593ce 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -7,6 +7,7 @@ es:
active_count_after: activo
active_footnote: Usuarios Activos Mensuales (UAM)
administered_by: 'Administrado por:'
+ api: API
apps: Aplicaciones móviles
apps_platforms: Utiliza Mastodon desde iOS, Android y otras plataformas
browse_directory: Navega por el directorio de perfiles y filtra por intereses
@@ -14,6 +15,7 @@ es:
browse_public_posts: Navega por un transmisión en vivo de publicaciones públicas en Mastodon
contact: Contacto
contact_missing: No especificado
+ contact_unavailable: No disponible
discover_users: Descubrir usuarios
documentation: Documentación
federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Mastodon y más allá.
@@ -80,6 +82,7 @@ es:
posts_with_replies: Publicaciones y respuestas
roles:
admin: Administrador
+ bot: Bot
group: Grupo
moderator: Moderador
unavailable: Perfil no disponible
@@ -99,6 +102,7 @@ es:
approve_all: Aprobar todos
approved_msg: La solicitud de registro de %{username} ha sido aprobada correctamente
are_you_sure: "¿Estás seguro?"
+ avatar: Avatar
by_domain: Dominio
change_email:
changed_msg: "¡El correo electrónico se ha actualizado correctamente!"
@@ -131,9 +135,11 @@ es:
inbox_url: URL de la bandeja de entrada
invite_request_text: Razones para unirse
invited_by: Invitado por
+ ip: IP
joined: Unido
location:
all: Todos
+ local: Local
remote: Remoto
title: Localización
login_status: Estado del login
@@ -210,6 +216,7 @@ es:
username: Nombre de usuario
view_domain: Ver resumen del dominio
warn: Adevertir
+ web: Web
whitelisted: Añadido a la lista blanca
action_logs:
action_types:
@@ -333,6 +340,7 @@ es:
disable: Deshabilitar
disabled: Desactivado
disabled_msg: Se deshabilitó con éxito ese emoji
+ emoji: Emoji
enable: Habilitar
enabled: Activado
enabled_msg: Se habilitó con éxito ese emoji
@@ -370,6 +378,7 @@ es:
recent_users: Usuarios recientes
search: Búsqueda por texto completo
single_user_mode: Modo único usuario
+ software: Software
space: Uso de almacenamiento
title: Tablero
total_users: usuarios en total
@@ -692,6 +701,7 @@ es:
last_active: Última actividad
most_popular: Más popular
most_recent: Más reciente
+ name: Hashtag
review: Estado de revisión
reviewed: Revisado
title: Etiquetas
@@ -738,6 +748,7 @@ es:
toot_layout: Diseño de las publicaciones
application_mailer:
notification_preferences: Cambiar preferencias de correo electrónico
+ salutation: "%{name}:"
settings: 'Cambiar preferencias de correo: %{link}'
view: 'Vista:'
view_profile: Ver perfil
@@ -772,6 +783,9 @@ es:
migrate_account: Mudarse a otra cuenta
migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes configurarlo aquí.
or_log_in_with: O inicia sesión con
+ providers:
+ cas: CAS
+ saml: SAML
register: Registrarse
registration_closed: "%{instance} no está aceptando nuevos miembros"
resend_confirmation: Volver a enviar el correo de confirmación
@@ -812,15 +826,24 @@ es:
errors:
invalid_key: no es una clave Ed25519 o Curve25519 válida
invalid_signature: no es una firma Ed25519 válida
+ date:
+ formats:
+ default: "%d %b %Y"
+ with_month_name: "%d %B %Y"
datetime:
distance_in_words:
+ about_x_hours: "%{count} h"
about_x_months: "%{count}m"
about_x_years: "%{count}a"
almost_x_years: "%{count}a"
half_a_minute: Justo ahora
+ less_than_x_minutes: "%{count} m"
less_than_x_seconds: Justo ahora
over_x_years: "%{count}a"
+ x_days: "%{count} d"
+ x_minutes: "%{count} m"
x_months: "%{count}m"
+ x_seconds: "%{count} s"
deletes:
challenge_not_passed: Los datos introducidos son incorrectos
confirm_password: Ingresa tu contraseña actual para demostrar tu identidad
@@ -872,6 +895,7 @@ es:
size: Tamaño
blocks: Personas que has bloqueado
bookmarks: Marcadores
+ csv: CSV
domain_blocks: Bloqueos de dominios
lists: Listas
mutes: Tienes en silencio
@@ -1067,8 +1091,13 @@ es:
number:
human:
decimal_units:
+ format: "%n %u"
units:
+ billion: MM
+ million: M
+ quadrillion: MB
thousand: m
+ trillion: B
otp_authentication:
code_hint: Introduce el código generado por tu aplicación de autentificación para confirmar
description_html: Si habilitas autenticación de dos factores a través de una aplicación de autenticación, el ingreso requerirá que estés en posesión de tu teléfono, que generará códigos para que ingreses.
@@ -1082,6 +1111,7 @@ es:
next: Próximo
older: Más antiguo
prev: Anterior
+ truncate: "…"
polls:
errors:
already_voted: Ya has votado en esta encuesta
@@ -1143,15 +1173,40 @@ es:
activity: Última actividad
browser: Navegador
browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ electron: Electron
+ firefox: Firefox
generic: Desconocido
+ ie: Internet Explorer
+ micro_messenger: MicroMessenger
nokia: Navegador de Nokia S40 Ovi
+ opera: Opera
+ otter: Otter
+ phantom_js: PhantomJS
qq: Navegador QQ
+ safari: Safari
+ uc_browser: UCBrowser
+ weibo: Weibo
current_session: Sesión actual
description: "%{browser} en %{platform}"
explanation: Estos son los navegadores web conectados actualmente en tu cuenta de Mastodon.
+ ip: IP
platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: Blackberry
+ chrome_os: ChromeOS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: GNU Linux
mac: Mac
other: Desconocido
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
revoke: Revocar
revoke_success: Sesión revocada exitosamente
title: Sesiones
@@ -1179,6 +1234,9 @@ es:
webauthn_authentication: Claves de seguridad
statuses:
attached:
+ audio:
+ one: "%{count} audio"
+ other: "%{count} audios"
description: 'Adjunto: %{attached}'
image:
one: "%{count} imagen"
@@ -1214,6 +1272,7 @@ es:
show_older: Mostrar más antiguos
show_thread: Mostrar discusión
sign_in_to_participate: Regístrate para participar en la conversación
+ title: "%{name}: «%{quote}»"
visibilities:
direct: Directa
private: Sólo mostrar a seguidores
@@ -1318,6 +1377,7 @@ es:
time:
formats:
default: "%d de %b del %Y, %H:%M"
+ month: "%b %Y"
two_factor_authentication:
add: Añadir
disable: Deshabilitar
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index e37219251..30230a97c 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -64,7 +64,7 @@ fa:
other: پیگیر
following: پی میگیرد
instance_actor_flash: این حساب یک عامل مجازی است که به نمایندگی از خود کارساز استفاده میشود و نه هیچ یکی از کاربران. این حساب به منظور اتصال به فدراسیون استفاده میشود و نباید معلق شود.
- joined: کاربر از %{date}
+ joined: پیوسته از %{date}
last_active: آخرین فعالیت
link_verified_on: مالکیت این پیوند در %{date} بررسی شد
media: عکس و ویدیو
@@ -428,7 +428,13 @@ fa:
unsuppress: بازگردانی پیشنهادهای پیگیری
instances:
back_to_all: همه
+ back_to_limited: محدود
+ back_to_warning: هشدار
by_domain: دامین
+ delivery:
+ all: همه
+ unavailable: ناموجود
+ warning: هشدار
delivery_available: پیام آماده است
empty: هیج دامنهای پیدا نشد.
known_accounts:
@@ -1327,7 +1333,6 @@ fa:
time:
formats:
default: "%d %b %Y, %H:%M"
- month: "%Ob %Y"
two_factor_authentication:
add: افزودن
disable: غیرفعالکردن
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 92f373d00..5db62a01a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -273,6 +273,7 @@ fr:
create_domain_block_html: "%{name} a bloqué le domaine %{target}"
create_email_domain_block_html: "%{name} a bloqué de domaine de courriel %{target}"
create_ip_block_html: "%{name} a créé une règle pour l'IP %{target}"
+ create_unavailable_domain_html: "%{name} a arrêté la livraison vers le domaine %{target}"
demote_user_html: "%{name} a rétrogradé l'utilisateur·rice %{target}"
destroy_announcement_html: "%{name} a supprimé l'annonce %{target}"
destroy_custom_emoji_html: "%{name} a détruit l'émoji %{target}"
@@ -281,6 +282,7 @@ fr:
destroy_email_domain_block_html: "%{name} a débloqué le domaine de courriel %{target}"
destroy_ip_block_html: "%{name} a supprimé la règle pour l'IP %{target}"
destroy_status_html: "%{name} a supprimé le statut de %{target}"
+ destroy_unavailable_domain_html: "%{name} a repris la livraison au domaine %{target}"
disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
@@ -453,10 +455,25 @@ fr:
title: Recommandations d'abonnement
unsuppress: Rétablir les recommandations d'abonnement
instances:
+ back_to_all: Tout
+ back_to_limited: Limité
+ back_to_warning: Avertissement
by_domain: Domaine
delivery:
+ all: Tout
+ clear: Effacer les erreurs de livraison
+ restart: Redémarrer la livraison
+ stop: Arrêter la livraison
+ title: Livraison
unavailable: Indisponible
+ unavailable_message: Livraison indisponible
+ warning: Avertissement
+ warning_message:
+ one: Échec de livraison %{count} jour
+ other: Échec de livraison %{count} jours
delivery_available: Livraison disponible
+ delivery_error_days: Jours d'erreur de livraison
+ delivery_error_hint: Si la livraison n'est pas possible pendant %{count} jours, elle sera automatiquement marquée comme non livrable.
empty: Aucun domaine trouvé.
known_accounts:
one: "%{count} compte connu"
@@ -636,7 +653,7 @@ fr:
desc_html: Affichée dans la barre latérale et dans les méta-tags. Décrivez ce qui rend spécifique ce serveur Mastodon en un seul paragraphe. Si laissée vide, la description du serveur sera affiché par défaut.
title: Description courte du serveur
site_terms:
- desc_html: Affichée sur la page des conditions d’utilisation du site. Vous pouvez utiliser des balises HTML
+ desc_html: Vous pouvez écrire votre propre politique de confidentialité, conditions d’utilisation ou autre jargon juridique. Vous pouvez utiliser des balises HTML
title: Politique de confidentialité
site_title: Nom du serveur
thumbnail:
@@ -1352,7 +1369,7 @@ fr:
Ce document est publié sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 7 mars 2018.
Originellement adapté de la politique de confidentialité de Discourse.
- title: "%{instance} Conditions d’utilisation et politique de confidentialité" + title: Conditions d’utilisation et politique de confidentialité de %{instance} themes: contrast: Mastodon (Contraste élevé) default: Mastodon (Sombre) diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 6be1d480f..6ec1cf25a 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -36,7 +36,7 @@ gd: one: phost other: post two: phost - status_count_before: A sgrìobh + status_count_before: A dh’fhoillsich tagline: Lean air caraidean ’s lorg feadhainn ùra terms: Teirmichean na seirbheise unavailable_content: Frithealaichean fo mhaorsainneachd @@ -534,7 +534,7 @@ gd: relays: add_new: Cuir ath-sheachadan ùr ris delete: Sguab às - description_html: "’S e frithealaiche eadar-mheadhanach a th’ ann an ath-sheachadan co-nasgaidh a nì iomlaid air grunnan mòra de dhùdan poblach eadar na frithealaichean a dh’fho-sgrìobhas ’s a dh’fhoillsicheas dha. ’S urrainn dha cuideachadh a thoirt do dh’fhrithealaichean beaga is meadhanach mòr ach an lorg iad susbaint sa cho-shaoghal agus às an aonais, bhiodh aig cleachdaichean ionadail leantainn air daoine eile air frithealaichean cèine a làimh." + description_html: "’S e frithealaiche eadar-mheadhanach a th’ ann an ath-sheachadan co-nasgaidh a nì iomlaid air grunnan mòra de phostaichean poblach eadar na frithealaichean a dh’fho-sgrìobhas ’s a dh’fhoillsicheas dha. ’S urrainn dha cuideachadh a thoirt do dh’fhrithealaichean beaga is meadhanach mòr ach an lorg iad susbaint sa cho-shaoghal agus às an aonais, bhiodh aig cleachdaichean ionadail leantainn air daoine eile air frithealaichean cèine a làimh." disable: Cuir à comas disabled: Chaidh a chur à comas enable: Cuir an comas @@ -601,10 +601,10 @@ gd: settings: activity_api_enabled: desc_html: Cunntasan nam postaichean a chaidh fhoillseachadh gu h-ionadail, nan cleachdaichean gnìomhach ’s nan clàraidhean ùra an am bucaidean seachdaineil - title: Foillsich agragaid dhen stadastaireachd mu ghnìomhachd nan cleachdaichean + title: Foillsich agragaid dhen stadastaireachd mu ghnìomhachd nan cleachdaichean san API bootstrap_timeline_accounts: - desc_html: Sgar iomadh ainm cleachdaiche le cromag. Chan obraich ach cunntasan ionadail ’s gun ghlas orra. ’S e na rianairean ionadail uile a tha sa bhun-roghainn nuair a bhios seo falamh. - title: Leantainn tùsail nan cleachdaichean ùra + desc_html: Sgar iomadh ainm cleachdaiche le cromag. Cuiridh sinn geall gun nochd na cunntasan seo am measg nam molaidhean leantainn + title: Mol na cunntasan seo do chleachdaichean ùra contact_information: email: Post-d gnìomhachais username: Ainm cleachdaiche a’ chonaltraidh @@ -629,7 +629,7 @@ gd: title: Dealbh suaichnein peers_api_enabled: desc_html: Ainmean àrainne air an do thachair am frithealaiche seo sa cho-shaoghal - title: Foillsich liosta nam frithealaichean a chaidh a lorg + title: Foillsich liosta nam frithealaichean a chaidh a lorg san API preview_sensitive_media: desc_html: Ro-sheallaidh ceanglaichean dealbhag fhiù ’s ma chaidh comharradh gu bheil am meadhan frionasach title: Seall meadhanan frionasach ann an ro-sheallaidhean OpenGraph @@ -716,9 +716,9 @@ gd: accounts_today: Cleachdaidhean fa leth an-diugh accounts_week: Cleachdaidhean fa leth an t-seachdain seo breakdown: Seall an cleachdadh an-diugh a-rèir tùis - last_active: Gnìomhach an turas mu dheireadh + last_active: Air a chleachdadh o chionn ghoirid most_popular: Na tha fèill mhòr air - most_recent: As ùire + most_recent: Air a chruthachadh o chionn ghoirid name: Taga hais review: Dèan lèirmheas air an staid reviewed: Chaidh lèirmheas a dhèanamh air @@ -750,18 +750,18 @@ gd: created_msg: Chaidh an t-alias ùr a chruthachadh. ’S urrainn dhut tòiseachadh air imrich on seann-chunntas a-nis. deleted_msg: Chaidh an t-alias a thoirt air falbh. Chan urrainn dhut imrich on chunntas ud chan fhear seo tuilleadh. empty: Chan eil alias agad. - hint_html: Nam bu mhiann leat imrich o chunntas eile dhan fhear seo, ’s urrainn dhut alias a chruthachadh an-seo agus feumaidh tu sin a dhèanamh mus urrainn dhut tòiseachadh air an luchd-leantainn agad imrich on seann-chunntas dhan fhear seo. Tha an gnìomh seo fhèin neo-chronail is can eil e buan. Tòisichidh tu air imrich a’ chunntais on t-seann-chunntas. + hint_html: Nam bu mhiann leat imrich o chunntas eile dhan fhear seo, ’s urrainn dhut alias a chruthachadh an-seo agus feumaidh tu sin a dhèanamh mus urrainn dhut tòiseachadh air an luchd-leantainn agad imrich on seann-chunntas dhan fhear seo. Tha an gnìomh seo fhèin neo-chronail is chan eil e buan. Tòisichidh tu air imrich a’ chunntais on t-seann-chunntas. remove: Dì-cheangail an t-alias appearance: advanced_web_interface: Eadar-aghaidh-lìn adhartach - advanced_web_interface_hint: 'Ma tha thu airson leud gu lèir na sgrìn agad a chleachdadh, leigidh an eadar-aghaidh-lìn adhartach leat gun rèitich thu mòran cholbhan eadar-dhealaichte ach a faic thu na thogras tu de dh’fhiosrachadh aig an aon àm: Dachaigh, brathan, loidhne-ama cho-naisgte, na thogras tu de liostaichean is tagaichean hais.' + advanced_web_interface_hint: 'Ma tha thu airson leud gu lèir na sgrìn agad a chleachdadh, leigidh an eadar-aghaidh-lìn adhartach leat gun rèitich thu mòran cholbhan eadar-dhealaichte ach am faic thu na thogras tu de dh’fhiosrachadh aig an aon àm: Dachaigh, brathan, loidhne-ama cho-naisgte, na thogras tu de liostaichean is tagaichean hais.' animations_and_accessibility: Beòthachaidhean agus so-ruigsinneachd confirmation_dialogs: Còmhraidhean dearbhaidh discovery: Lorg localization: body: Tha Mastodon ’ga eadar-theangachadh le saor-thoilich. guide_link: https://crowdin.com/project/mastodon - guide_link_text: "’S urrainn do dhuine sam bith cuideachadh." + guide_link_text: "’S urrainn do neach sam bith cuideachadh." sensitive_content: Susbaint fhrionasach toot_layout: Co-dhealbhachd nam postaichean application_mailer: @@ -785,7 +785,7 @@ gd: checkbox_agreement_html: Gabhaidh mi ri riaghailtean an fhrithealaiche ’s teirmichean a’ chleachdaidh checkbox_agreement_without_rules_html: Gabhaidh mi ri teirmichean a’ chleachdaidh delete_account: Sguab às an cunntas - delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, Nì thu an-seo e. Thèid dearbhadh iarraidh ort. + delete_account_html: Nam bu mhiann leat an cunntas agad a sguabadh às, nì thu an-seo e. Thèid dearbhadh iarraidh ort. description: prefix_invited_by_user: Thug @%{name} cuireadh dhut ach am faigh thu ballrachd air an fhrithealaiche seo de Mhastodon! prefix_sign_up: Clàraich le Mastodon an-diugh! @@ -1043,7 +1043,7 @@ gd: not_found: "– cha deach seo a lorg" on_cooldown: Tha àm socrachaidh ort followers_count: Luchd-leantainn aig àm na h-imrich - incoming_migrations: Ag imrich o chunntas eile + incoming_migrations: Imrich o chunntas eile incoming_migrations_html: Airson imrich o chunntas eile dhan fhear seo, feumaidh tu alias cunntais a chruthachadh an toiseach. moved_msg: Tha an cunntas agad ’ga ath-stiùireadh gu %{acct} a-nis ’s an luchd-leantainn agad ’gan imrich. not_redirecting: Chan eil an cunntas agad ’ga ath-stiùireadh gu cunntas sam bith eile aig an àm seo. @@ -1056,7 +1056,7 @@ gd: warning: backreference_required: Feumaidh tu an cunntas ùr a rèiteachadh an toiseach ach an tomh e air ais dhan fhear seo before: 'Mus lean thu air adhart, leugh na nòtaichean seo gu cùramach:' - cooldown: Às dèidh imrich, tha àm socrachaidh ann rè nach urrainn dhut imrich eile a dhèanamh + cooldown: Às dèidh imrich, tha greis feitheimh ann rè nach urrainn dhut imrich eile a dhèanamh disabled_account: Cha ghabh an cunntas làithreach agad a chleachdadh gu slàn às a dhèidh. Gidheadh, bidh an dà chuid às-phortadh an dàta is ath-ghnìomhachadh ri fhaighinn dhut. followers: Imrichidh an gnìomh seo a h-uile neach-leantainn on chunntas làithreach dhan chunntas ùr only_redirect_html: Mar roghainn eile, ’s urrainn dhut ath-stiùireadh a-mhàin a chur air a’ phròifil agad. @@ -1192,7 +1192,7 @@ gd: proceed: Lean air adhart gus freagairt prompt: 'Tha thu airson freagairt dhan phost seo:' scheduled_statuses: - over_daily_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte dhan latha ud + over_daily_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte an-diugh over_total_limit: Chaidh thu thar na crìoch de %{limit} post(aichean) sgeidealaichte too_soon: Feumaidh ceann-latha an sgeideil a bhith san àm ri teachd sessions: @@ -1249,8 +1249,8 @@ gd: export: Às-phortadh dàta featured_tags: Tagaichean hais brosnaichte identity_proofs: Dearbhaidhean na dearbh-aithne - import: Ion-phortaich - import_and_export: Ion-phortaich is às-phortaich + import: Ion-phortadh + import_and_export: Ion-phortadh ⁊ às-phortadh migrate: Imrich cunntais notifications: Brathan preferences: Roghainnean @@ -1289,7 +1289,7 @@ gd: open_in_web: Fosgail air an lìon over_character_limit: chaidh thu thar crìoch charactaran de %{max} pin_errors: - limit: Tha an àireamh as motha de dhùdan prìnichte agad a tha ceadaichte + limit: Tha an àireamh as motha de phostaichean prìnichte agad a tha ceadaichte ownership: Chan urrainn dhut post càich a phrìneachadh private: Chan urrainn dhut post neo-phoblach a phrìneachadh reblog: Chan urrainn dhut brosnachadh a phrìneachadh @@ -1328,7 +1328,7 @@ gd: terms: body_html: 'Seo na dòighean air an cleachd sinn fiosrachadh sam bith a chruinnich sinn uat ma dh’fhaoidte:
Cuiridh sinn iomadh gleus tèarainteachd an sàs ach an glèidheadh sinn sàbhailteachd an fhiosrachaidh phearsanta agad nuair a chuireas tu gin a-steach, nuair a chuireas tu a-null e no nuair a nì thu inntrigeadh air. Am measg gleusan eile, thèid seisean a’ bhrabhsair agad cuide ris an trafaig eadar na h-aplacaidean agad ’s an API a dhìon le SSL agus thèid hais a dhèanamh dhen fhacal-fhaire agad le algairim aon-shligheach làidir. Faodaidh tu dearbhadh dà-cheumnach a chur an comas airson barrachd tèarainteachd a chur ris an inntrigeadh dhan chunntas agad.
Nì sinn ar dìcheall:
’S urrainn dhut tasg-lann iarraidh dhen t-susbaint agad ’s a luchdadh a-nuas is gabhaidh seo a-staigh na postaichean, na ceanglachain meadhain, dealbh na pròifil agus dealbh a’ bhanna-chinn agad.
’S urrainn dhut an cunntas agad a sguabadh às gu buan uair sam bith.
Cleachdaidh. ’S e faidhlichean beaga a tha sna briosgaidean a thar-chuireas làrach no solaraiche seirbheise gu clàr-cruaidh a’ choimpiutair agad leis a’ bhrabhsair-lìn agad (ma cheadaicheas tu sin). Bheir na briosgaidean sin comas dhan làrach gun aithnich i am brabhsair agad agus ma tha cunntas clàraichte agad, gun co-cheangail i ris a’ chunntas chlàraichte agad e.
Cleachdaidh sinn briosgaidean airson na roghainnean agad a thuigsinn ’s a ghlèidheadh gus an tadhail thu oirnn san àm ri teachd.
Cha reic, malairt no tar-chuir sinn fiosrachadh air a dh’aithnichear thu fhèin gu pàrtaidh sam bith air an taobh a-muigh. Cha ghabh seo a-staigh treas-phàrtaidhean earbsach a chuidicheas leinn le ruith na làraich againn, le obrachadh a’ ghnìomhachais againn no gus an t-seirbheis a thoirt leat cho fada ’s a dh’aontaicheas na treas-phàrtaidhean sin gun cùm iad am fiosrachadh dìomhair. Faodaidh sinn am fiosrachadh agad fhoillseachadh cuideachd nuair a bhios sinn dhen bheachd gu bheil am foillseachadh sin iomchaidh airson gèilleadh dhan lagh, poileasaidhean na làraich againn èigneachadh no na còraichean, an sealbh no an t-sàbhailteachd againn fhèin no aig càch a dhìon.
Dh’fhaoidte gun dèid an t-susbaint phoblach agad a luchdadh a-nuas le frithealaichean eile san lìonra. Thèid na postaichean poblach agad ’s an fheadhainn dhan luchd-leantainn a-mhàin a lìbhrigeadh dha na frithealaichean far a bheil an luchd-leantainn agad a’ còmhnaidh agus thèid na teachdaireachdan dìreach a lìbhrigeadh gu frithealaichean nam faightearan nuair a bhios iad a’ còmhnaidh air frithealaiche eile.
Nuair a dh’ùghdarraicheas tu aplacaid gun cleachd i an cunntas agad, a-rèir sgòp nan ceadan a dh’aontaicheas tu riutha, faodaidh i fiosrachadh poblach na pròifil agad, liosta na feadhna air a bhios tu a’ leantainn, an luchd-leantainn agad, na liostaichean agad, na postaichean agad uile ’s na h-annsachdan agad inntrigeadh. Chan urrainn do dh’aplacaidean an seòladh puist-d no am facal-faire agad inntrigeadh idir.
Ma tha am frithealaiche seo san Aonadh Eòrpach (AE) no san Roinn Eaconomach na h-Eòrpa (EEA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 16 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon GDPR (General Data Protection Regulation) nach cleachd thu an làrach seo.
Ma tha am frithealaiche seo sna Stàitean Aonaichte (SAA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 13 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon COPPA (Children''s Online Privacy Protection Act)ha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 16 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon GDPR (General Data Protection Regulation) nach cleachd thu an làrach seo.
Ma tha am frithealaiche seo sna Stàitean Aonaichte (SAA): Tha an làrach, na batharan agus na seirbheisean againn uile ag amas air an fheadhainn a tha co-dhiù 13 bliadhnaichean a dh’aois. Ma tha thu nas òige na 16 bliadhnaichean a dh’aois, tha e riatanach fon COPPA (Children''s Online Privacy Protection Act) nach cleachd thu an làrach seo.
Dh’fhaoidte gu bheil am frithealaiche seo fo riatanasan lagha eile ma tha e ann an uachdranas laghail eile.
Ma chuireas sinn romhainn am poileasaidh prìobhaideachd againn atharrachadh, postaichidh sinn na h-atharraichean dhan duilleag seo.
Tha an sgrìobhainn seo fo cheadachas CC-BY-SA. Chaidh ùrachadh an turas mu dheireadh an t-7mh dhen Mhart 2018.
Chaidh a fhreagarrachadh o thùs o phoileasaidh prìobhaideachd Discourse.
nach cleachd thu an làrach seo.Dh’fhaoidte gu bheil am frithealaiche seo fo riatanasan lagha eile ma tha e ann an uachdranas laghail eile.
Ma chuireas sinn romhainn am poileasaidh prìobhaideachd againn atharrachadh, postaichidh sinn na h-atharraichean dhan duilleag seo.
Tha an sgrìobhainn seo fo cheadachas CC-BY-SA. Chaidh ùrachadh an turas mu dheireadh an t-7mh dhen Mhart 2018.
Chaidh a fhreagarrachadh o thùs o phoileasaidh prìobhaideachd Discourse.
-' + ' title: Teirmichean na seirbheise ⁊ poileasaidh prìobhaideachd %{instance} themes: contrast: Mastodon (iomsgaradh àrd) @@ -1390,7 +1390,7 @@ gd: edit_profile_step: "’S urrainn dhut a’ phròifil agad a ghnàthachadh is tu a’ luchdadh suas avatar no bann-cinn, ag atharrachadh d’ ainm-taisbeanaidh is a bharrachd. Nam bu mhiann leat lèirmheas a dhèanamh air daoine mus fhaod iad leantainn ort, ’s urrainn dhut an cunntas agad a ghlasadh." explanation: Seo gliocas no dhà gus tòiseachadh final_action: Tòisich air postadh - final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith a’ leantainn ort, chì cuid mhath na teachdaireachdan poblach agad, can air an loidhne-ama ionadail agus le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #introductions?' + final_step: 'Tòisich air postadh! Fiù ’s mur eil duine sam bith a’ leantainn ort, chì cuid mhath na postaichean poblach agad, can air an loidhne-ama ionadail agus le tagaichean hais. Saoil an innis thu beagan mu d’ dhèidhinn air an taga hais #introductions?' full_handle: D’ ainm-cleachdaiche slàn full_handle_hint: Seo na bheir thu dha na caraidean agad ach an urrainn dhaibh teachdaireachd a chur thugad no leantainn ort o fhrithealaiche eile. review_preferences_action: Atharraich na roghainnean diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 09d758902..ce7dd20ce 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -23,7 +23,7 @@ gl: hosted_on: Mastodon aloxado en %{domain} instance_actor_flash: 'Esta conta é un actor virtual utilizado para representar ao servidor e non a unha usuaria individual. Utilízase para propósitos de federación e non debería estar bloqueada a menos que queiras bloquear a toda a instancia, en tal caso deberías utilizar o bloqueo do dominio. -' + ' learn_more: Saber máis privacy_policy: Política de privacidade rules: Regras do servidor @@ -43,7 +43,7 @@ gl: reason: Razón rejecting_media: 'Os ficheiros multimedia deste servidor non serán procesados e non se amosarán miniaturas, o que require un clic manual no ficheiro orixinal:' rejecting_media_title: Multimedia filtrado - silenced: 'As publicacións deste servidor non se amosarán en conversas e liñas temporais, nin terás notificacións das súas usuarias agás que as sigas:' + silenced: 'As publicacións destes servidores non se amosarán en conversas e cronoloxías públicas, nin terás notificacións xeradas polas interaccións das usuarias, a menos que as estés a seguir:' silenced_title: Servidores acalados suspended: 'Non se procesarán, almacenarán nin intercambiarán datos destes servidores, o que fai imposíbel calquera interacción ou comunicación coas usuarias dende estes servidores:' suspended_title: Servidores suspendidos @@ -639,7 +639,7 @@ gl: title: Estado do rexistro show_known_fediverse_at_about_page: desc_html: Si activado, mostraralle os toots de todo o fediverso coñecido nunha vista previa. Si non só mostrará os toots locais. - title: Mostrar vista previa do fediverso na liña temporal + title: Incluír contido federado na páxina da cronoloxía pública sen autenticación show_staff_badge: desc_html: Mostrar unha insignia de membresía nunha páxina de usuaria title: Mostrar insigna de membresía @@ -660,8 +660,8 @@ gl: desc_html: Utilizado para vistas previsas vía OpenGraph e API. Recoméndase 1200x630px title: Icona do servidor timeline_preview: - desc_html: Mostrar liña de tempo pública na páxina de inicio - title: vista previa da liña temporal + desc_html: Mostrar ligazón á cronoloxía pública na páxina de benvida e permitir o acceso API á cronoloxía pública sen ter autenticación + title: Permitir acceso á cronoloxía pública sen autenticación title: Axustes do sitio trendable_by_default: desc_html: Afecta ós cancelos que non foron rexeitados de xeito previo @@ -908,9 +908,9 @@ gl: filters: contexts: account: Perfís - home: Liña temporal inicial + home: Inicio e listaxes notifications: Avisos - public: Liñas temporais públicas + public: Cronoloxías públicas thread: Conversas edit: title: Editar filtro @@ -1126,7 +1126,7 @@ gl: preferences: other: Outro posting_defaults: Valores por omisión - public_timelines: Liñas temporais públicas + public_timelines: Cronoloxías públicas reactions: errors: limit_reached: Acadouse o límite das diferentes reaccións @@ -1280,7 +1280,7 @@ gl: public: Público public_long: Visible para calquera unlisted: Non listado - unlisted_long: Visible para calquera, pero non listado en liñas de tempo públicas + unlisted_long: Visible para calquera, pero non en cronoloxías públicas stream_entries: pinned: Publicación fixada reblogged: promovido @@ -1386,12 +1386,12 @@ gl: enabled: A autenticación de dobre-factor está activada enabled_success: Activouse con éxito a autenticación de dobre-factor generate_recovery_codes: Xerar códigos de recuperación - lost_recovery_codes: Os códigos de recuperación permítenlle recuperar o acceso a súa conta si perde o teléfono. Si perde os códigos de recuperación, pode restauralos aquí. Os seus códigos de recuperación anteriores serán invalidados. + lost_recovery_codes: Os códigos de recuperación permítenche recuperar o acceso a túa conta se perdes o teléfono. Se perdes os códigos de recuperación, podes restauralos aquí. Os teus códigos de recuperación anteriores serán invalidados. methods: Métodos para o segundo factor otp: App autenticadora recovery_codes: Códigos de recuperación do respaldo recovery_codes_regenerated: Códigos de recuperación xerados correctamente - recovery_instructions_html: Si perdese o acceso ao seu teléfono, pode utilizar un dos códigos inferiores de recuperación para recuperar o acceso a súa conta. Garde os códigos en lugar seguro. Por exemplo, pode imprimilos e gardalos xunto con outros documentos importantes. + recovery_instructions_html: Se perdeses o acceso ao teu teléfono, podes utilizar un dos códigos de recuperación inferiores para recuperar o acceso á conta. Garda os códigos nun lugar seguro. Por exemplo, podes imprimilos e gardalos xunto con outros documentos importantes. webauthn: Chaves de seguridade user_mailer: backup_ready: @@ -1430,15 +1430,15 @@ gl: edit_profile_step: Podes personalizar o teu perfil subindo un avatar, cabeceira, cambiar o nome público e aínda máis. Se restrinxes a túa conta podes revisar a conta das persoas que solicitan seguirte antes de permitirlles o acceso aos teus toots. explanation: Aquí ten alunhas endereitas para ir aprendendo final_action: Comece a publicar - final_step: 'Publica! Incluso sen seguidoras as túas mensaxes serán vistas por outras, por exemplo na liña temporal local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.' + final_step: 'Publica! Incluso sen seguidoras as túas mensaxes públicas serán vistas por outras, por exemplo na cronoloxía local e nos cancelos. Poderías presentarte ao #fediverso utilizando o cancelo #introductions.' full_handle: O seu alcume completo full_handle_hint: Esto é o que lle dirá aos seus amigos para que poidan seguila ou enviarlle mensaxes desde outro servidor. review_preferences_action: Cambiar preferencias review_preferences_step: Lembre establecer as preferencias, tales como qué correos-e lle querería recibir, ou o nivel de intimidade por omisión para as súas mensaxes. Se non lle molestan as imaxes con movemento, pode escoller que os GIF se reproduzan automáticamente. subject: Benvida a Mastodon - tip_federated_timeline: A liña temporal federada é unha visión reducida da rede Mastodon. Inclúe xente a que segue xente que ti segues, así que non é completa. - tip_following: Por omisión segues a Admin(s) no teu servidor. Para atopar máis xente interesante, mira nas liñas temporais local e federada. - tip_local_timeline: A liña temporal local é unha ollada xeral sobre a xente en %{instance}. Son as súas veciñas máis próximas! + tip_federated_timeline: A cronoloxía federada é unha visión reducida da rede Mastodon. Inclúe xente a que segue xente que ti segues, así que non é completa. + tip_following: Por defecto segues a Admin(s) no teu servidor. Para atopar máis xente interesante, mira nas cronoloxías local e federada. + tip_local_timeline: A cronoloxía local é unha ollada xeral sobre a xente en %{instance}. Son as súas veciñas máis próximas! tip_mobile_webapp: Si o navegador móbil lle ofrece engadir Mastodon a pantalla de inicio, pode recibir notificacións push. En moitos aspectos comportarase como un aplicativo nativo! tips: Consellos title: Benvida, %{name}! @@ -1447,7 +1447,7 @@ gl: generic_access_help_html: Problemas para acceder a conta? Podes contactar con %{email} para obter axuda invalid_otp_token: O código do segundo factor non é válido invalid_sign_in_token: Código de seguridade non válido - otp_lost_help_html: Si perde o acceso a ambos, pode contactar con %{email} + otp_lost_help_html: Se perdes o acceso a ambos, podes contactar con %{email} seamless_external_login: Está conectado a través de un servizo externo, polo que os axustes de contrasinal e correo-e non están dispoñibles. signed_in_as: 'Rexistrada como:' suspicious_sign_in_confirmation: Semella que non te conectaches antes desde este dispositivo, e hai tempo que non te conectas, así que ímosche enviar un código de seguridade ao teu enderezo de email para confirmar que es ti. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5106372aa..ebc1ec822 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -846,7 +846,7 @@ ja: email_change_html: アカウントを削除しなくてもメールアドレスを変更できます email_contact_html: それでも届かない場合、%{email} までメールで問い合わせてください email_reconfirmation_html: 確認のメールが届かない場合、もう一度申請できます。 - irreversible: アカウントを元に戻したり復活させることはできません + irreversible: 削除操作の撤回やアカウントの復活はできません more_details_html: 詳しくはプライバシーポリシーをご覧ください。 username_available: あなたのユーザー名は再利用できるようになります username_unavailable: あなたのユーザー名は引き続き利用できません diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 9844ac083..c215ee1ca 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -478,6 +478,11 @@ pl: unavailable: Niedostępne unavailable_message: Doręczaniei niedostępne warning: Ostrzeżenie + warning_message: + few: "%{count} dni niepowodzenia doręczenia" + many: "%{count} dni niepowodzenia doręczenia" + one: "%{count} dzień niepowodzenia doręczenia" + other: "%{count} dni niepowodzenia doręczenia" delivery_available: Doręczanie jest dostępne delivery_error_days: Dni błędów doręczenia delivery_error_hint: Jeżeli doręczanie nie będzie możliwe przez %{count} dni, zostanie automatycznie oznaczona jako nie do doręczania. diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 4811bc0b7..18142cb49 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -23,7 +23,7 @@ sc: hosted_on: Mastodon allogiadu in %{domain} instance_actor_flash: 'Custu contu est un''atore virtuale impreadu pro rapresentare su pròpiu serbidore, no est un''utente individuale. Benit impreadu pro punnas de federatzione e no ddu dias dèpere blocare si non boles blocare su domìniu intreu, e in cussu casu dias dèpere impreare unu blocu de domìniu. -' + ' learn_more: Àteras informatziones privacy_policy: Polìtica de riservadesa rules: Règulas de su serbidore diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml index 92e9af416..8403f2c16 100644 --- a/config/locales/simple_form.cs.yml +++ b/config/locales/simple_form.cs.yml @@ -167,7 +167,7 @@ cs: setting_system_font_ui: Použít výchozí písmo systému setting_theme: Vzhled stránky setting_trends: Zobrazit dnes populární hashtagy - setting_unfollow_modal: Ppřed zrušením sledování zobrazovat potvrzovací okno + setting_unfollow_modal: Před zrušením sledování zobrazovat potvrzovací okno setting_use_blurhash: Zobrazit pro skrytá média barevné gradienty setting_use_pending_items: Pomalý režim severity: Vážnost diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index 3f84121a7..93c57ee85 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -163,6 +163,7 @@ da: setting_hide_network: Skjul din sociale graf setting_noindex: Fravælg søgemaskineindeksering setting_reduce_motion: Reducér animationsbevægelse + setting_show_application: Viser applikation, der bruges til at sende indlæg setting_system_font_ui: Brug systemets standardskrifttype setting_theme: Webstedstema setting_trends: Vis dagens tendenser diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 3d0d1f1a7..bffcd8256 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -53,7 +53,7 @@ en: setting_display_media_hide_all: Always hide media setting_display_media_show_all: Always show media setting_hide_network: Who you follow and who follows you will be hidden on your profile - setting_noindex: Affects your public profile and status pages + setting_noindex: Affects your public profile and post pages setting_show_application: The application you use to post will be displayed in the detailed view of your posts setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed @@ -199,12 +199,12 @@ en: severity: Rule notification_emails: digest: Send digest e-mails - favourite: Someone favourited your status + favourite: Someone favourited your post follow: Someone followed you follow_request: Someone requested to follow you mention: Someone mentioned you pending_account: New account needs review - reblog: Someone boosted your status + reblog: Someone boosted your post report: New report is submitted trending_tag: An unreviewed hashtag is trending rule: diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml index 95c98dff1..ea918648e 100644 --- a/config/locales/simple_form.es-AR.yml +++ b/config/locales/simple_form.es-AR.yml @@ -52,7 +52,7 @@ es-AR: setting_display_media_hide_all: Siempre ocultar todos los medios setting_display_media_show_all: Siempre mostrar todos los medios setting_hide_network: Las cuentas que seguís y tus seguidores serán ocultados en tu perfil - setting_noindex: Afecta a tu perfil público y páginas de estado + setting_noindex: Afecta a tu perfil público y páginas de mensajes setting_show_application: La aplicación que usás para enviar mensajes se mostrará en la vista detallada de tus mensajes setting_use_blurhash: Los gradientes se basan en los colores de las imágenes ocultas pero haciendo borrosos los detalles setting_use_pending_items: Ocultar actualizaciones de la línea temporal detrás de un clic en lugar de desplazar automáticamente el flujo diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml index 3ced0e244..0bf72bac2 100644 --- a/config/locales/simple_form.es-MX.yml +++ b/config/locales/simple_form.es-MX.yml @@ -18,7 +18,7 @@ es-MX: disable: Evitar que el usuario utilice su cuenta, pero no eliminar ni ocultar sus contenidos. none: Utilizar esto para enviar una advertencia al usuario, sin poner en marcha ninguna otra acción. sensitive: Forzar que todos los archivos multimedia de este usuario sean marcados como sensibles. - silence: Evitar que el usuario pueda tootear con visibilidad pública, ocultar sus publicaciones y notificaciones a personas que no lo siguen. + silence: Evitar que el usuario pueda publicar con visibilidad pública, oculta sus mensajes y notificaciones a personas que no lo siguen. suspend: Evitar cualquier interacción desde o hacia esta cuenta y eliminar su contenido. Reversible en un plazo de 30 días. warning_preset_id: Opcional. Aún puede añadir texto personalizado al final de la configuración predefinida announcement: @@ -120,6 +120,7 @@ es-MX: text: Anuncio defaults: autofollow: Invitar a seguir tu cuenta + avatar: Avatar bot: Esta es una cuenta bot chosen_languages: Filtrar idiomas confirm_new_password: Confirmar nueva contraseña @@ -189,6 +190,7 @@ es-MX: text: "¿Por qué quiere unirse usted?" ip_block: comment: Comentario + ip: IP severities: no_access: Bloquear acceso sign_up_requires_approval: Limitar registros @@ -210,8 +212,10 @@ es-MX: name: Etiqueta trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a los toots usar esta etiqueta + 'no': 'No' recommended: Recomendado required: + mark: "*" text: necesario title: sessions: diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index c6291abdf..cc01cd179 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -35,7 +35,7 @@ es: current_password: Por razones de seguridad por favor ingrese la contraseña de la cuenta actual current_username: Para confirmar, por favor ingrese el nombre de usuario de la cuenta actual digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia - discoverable: El directorio del perfil es otra forma en la que su cuenta puede llegar a un público más amplio + discoverable: Permite que tu cuenta sea encontrada por desconocidos por medio de recomendaciones y otras herramientas email: Se le enviará un correo de confirmación fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px @@ -120,6 +120,7 @@ es: text: Anuncio defaults: autofollow: Invitar a seguir tu cuenta + avatar: Avatar bot: Esta es una cuenta bot chosen_languages: Filtrar idiomas confirm_new_password: Confirmar nueva contraseña @@ -127,7 +128,7 @@ es: context: Filtrar contextos current_password: Contraseña actual data: Información - discoverable: Listar esta cuenta en el directorio + discoverable: Sugerir la cuenta a otros display_name: Nombre para mostrar email: Dirección de correo electrónico expires_in: Expirar tras @@ -189,6 +190,7 @@ es: text: "¿Por qué quiere unirse usted?" ip_block: comment: Comentario + ip: IP severities: no_access: Bloquear acceso sign_up_requires_approval: Limitar registros @@ -210,8 +212,10 @@ es: name: Etiqueta trendable: Permitir que esta etiqueta aparezca bajo tendencias usable: Permitir a las publicaciones usar esta etiqueta + 'no': 'No' recommended: Recomendado required: + mark: "*" text: necesario title: sessions: diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index d768da037..4bc0a1a8f 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -149,7 +149,7 @@ fr: setting_aggregate_reblogs: Grouper les partages dans les fils d’actualités setting_auto_play_gif: Lire automatiquement les GIFs animés setting_boost_modal: Demander confirmation avant de partager un message - setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouvert en vue détaillée + setting_crop_images: Recadrer en 16x9 les images des messages qui ne sont pas ouverts en vue détaillée setting_default_language: Langue de publication setting_default_privacy: Confidentialité des messages setting_default_sensitive: Toujours marquer les médias comme sensibles diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml index b7502a192..64833d527 100644 --- a/config/locales/simple_form.gd.yml +++ b/config/locales/simple_form.gd.yml @@ -30,29 +30,29 @@ gd: defaults: autofollow: Leanaidh na daoine a chlàraicheas leis a cuireadh ort gu fèin-obrachail avatar: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px - bot: Tha an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir + bot: Comharraich do chàch gu bheil an cunntas seo ri gnìomhan fèin-obrachail gu h-àraidh is dh’fhaoidte nach doir duine sam bith sùil air idir context: Na co-theacsaichean air am bi a’ chriathrag an sàs current_password: A chùm tèarainteachd, cuir a-steach facal-faire a’ chunntais làithrich current_username: Airson seo a dhearbhadh, cuir a-steach ainm-cleachdaiche a’ chunntais làithrich digest: Cha dèid seo a chur ach nuair a bhios tu air ùine mhòr gun ghnìomh a ghabhail agus ma fhuair thu teachdaireachd phearsanta fhad ’s a bha thu air falbh - discoverable: "’S e dòigh eile a th’ ann an eòlaire nam pròifil leis an ruig an cunntas agad èisteachd nas fharsainge" + discoverable: Ceadaich gun lorg coigrich an cunntas agad le taic o mholaidhean is gleusan eile email: Thèid post-d dearbhaidh a chur thugad fields: Faodaidh tu suas ri 4 nithean a shealltainn mar chlàr air a’ phròifil agad header: PNG, GIF or JPG. %{size} air a char as motha. Thèid a sgèileadh sìos gu %{dimensions}px inbox_url: Dèan lethbhreac dhen URL o phrìomh-dhuilleag an ath-sheachadain a bu mhiann leat cleachdadh irreversible: Thèid postaichean criathraichte a-mach à sealladh gu buan fiù ’s ma bheir thu a’ chriathrag air falbh uaireigin eile locale: Cànan eadar-aghaidh a’ chleachdaiche, nam post-d ’s nam brathan putaidh - locked: Feumaidh tu gabhail ri luchd-leantainn ùr a làimh + locked: Stiùirich cò dh’fhaodas leantainn ort le gabhail ri iarrtasan leantainn a làimh password: Cleachd co-dhiù 8 caractaran phrase: Thèid a mhaidseadh gun aire air litrichean mòra ’s beaga no air rabhadh susbainte puist scopes: Na APIan a dh’fhaodas an aplacaid inntrigeadh. Ma thaghas tu sgòp air ìre as àirde, cha leig thu leas sgòpaichean fa leth a thaghadh. - setting_aggregate_reblogs: Na seall brosnachaidhean ùra do dhùdan a chaidh a bhrosnachadh o chionn ghoirid (cha doir seo buaidh ach air brosnachaidhean ùra o seo a-mach) + setting_aggregate_reblogs: Na seall brosnachaidhean ùra do phostaichean a chaidh a bhrosnachadh o chionn ghoirid (cha doir seo buaidh ach air brosnachaidhean ùra o seo a-mach) setting_default_sensitive: Thèid meadhanan frionasach fhalach o thùs is gabhaidh an nochdadh le briogadh orra setting_display_media_default: Falaich meadhanan ris a bheil comharra gu bheil iad frionasach setting_display_media_hide_all: Falaich na meadhanan an-còmhnaidh setting_display_media_show_all: Seall na meadhanan an-còmhnaidh - setting_hide_network: Cha nochd cò a tha thu a’ leantainn orra no an luchd-leantainn agad fhèin air a’ phròifil agad - setting_noindex: Bheir seo buaidh air a’ phròifil phoblach ’s air duilleagan nan staidean agad + setting_hide_network: Thèid cò a tha thu a’ leantainn orra ’s an luchd-leantainn agad fhèin a chur am falach air a’ phròifil agad + setting_noindex: Bheir seo buaidh air a’ phròifil phoblach ’s air duilleagan nam postaichean agad setting_show_application: Chithear cò an aplacaid a chleachd thu airson post a sgrìobhadh ann an seallaidhean mionaideach nam postaichean agad setting_use_blurhash: Tha caiseadan stèidhichte air dathan nan nithean lèirsinneach a chaidh fhalach ach chan fhaicear am mion-fhiosrachadh setting_use_pending_items: Falaich ùrachaidhean na loidhne-ama air cùlaibh briogaidh seach a bhith a’ sgroladh an inbhir gu fèin-obrachail @@ -68,7 +68,7 @@ gd: form_challenge: current_password: Tha thu a’ tighinn a-steach gu raon tèarainte imports: - data: Chaidh am faidhle CSV às-phortadh o fhrithealaiche Mastodon eile + data: Faidhle CSV a chaidh às-phortadh o fhrithealaiche Mastodon eile invite_request: text: Bidh e nas fhasa dhuinn lèirmheas a dhèanamh air d’ iarrtas ip_block: @@ -128,7 +128,7 @@ gd: context: Co-theacsaichean na criathraige current_password: Am facal-faire làithreach data: Dàta - discoverable: Seall an cunntas seo san eòlaire + discoverable: Mol an cunntas do chàch display_name: Ainm-taisbeanaidh email: Seòladh puist-d expires_in: Falbhaidh an ùine air às dèidh @@ -138,7 +138,7 @@ gd: inbox_url: URL bogsa a-steach an ath-sheachadain irreversible: Leig seachad seach falach locale: Cànan na h-eadar-aghaidh - locked: Glais an cunntas + locked: Iarr iarrtasan leantainn max_uses: An àireamh as motha de chleachdaidhean new_password: Facal-faire ùr note: Mu mo dhèidhinn @@ -160,7 +160,7 @@ gd: setting_display_media_hide_all: Falaich na h-uile setting_display_media_show_all: Seall na h-uile setting_expand_spoilers: Leudaich postaichean ris a bheil rabhadh susbainte an-còmhnaidh - setting_hide_network: Falaich an lìonra agad + setting_hide_network: Falaich an graf sòisealta agad setting_noindex: Thoir air falbh an ro-aonta air inneacsadh le einnseanan-luirg setting_reduce_motion: Ìslich an gluasad sna beòthachaidhean setting_show_application: Foillsich dè an aplacaid a chleachdas tu airson postaichean a chur @@ -208,7 +208,7 @@ gd: rule: text: Riaghailt tag: - listable: Leig leis an taga hais seo gun nochd e ann an toraidhean luirg ’s air eòlaire nam pròifil + listable: Leig leis an taga hais seo gun nochd e ann an toraidhean luirg ’s am measg nam molaidhean name: Taga hais trendable: Leig leis an taga hais seo gun nochd e am measg nan treandaichean usable: Leig le postaichean an taga hais seo a chleachdadh diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml index 650a2578d..77380bbe0 100644 --- a/config/locales/simple_form.gl.yml +++ b/config/locales/simple_form.gl.yml @@ -55,7 +55,7 @@ gl: setting_noindex: Afecta ao teu perfil público e páxinas de estado setting_show_application: A aplicación que estás a utilizar para enviar publicacións mostrarase na vista detallada da publicación setting_use_blurhash: Os gradientes toman as cores da imaxe oculta pero esborranchando todos os detalles - setting_use_pending_items: Ocultar as actualizacións da liña temporal tras un click no lugar de desprazar automáticamente os comentarios + setting_use_pending_items: Agochar actualizacións da cronoloxía tras un click no lugar de desprazar automáticamente os comentarios username: O teu nome de usuaria será único en %{domain} whole_word: Se a chave ou frase de paso é só alfanumérica, só se aplicará se concorda a palabra completa domain_allow: @@ -146,7 +146,7 @@ gl: password: Contrasinal phrase: Palabra chave ou frase setting_advanced_layout: Activar interface web avanzada - setting_aggregate_reblogs: Agrupar promocións nas liñas temporais + setting_aggregate_reblogs: Agrupar promocións nas cronoloxías setting_auto_play_gif: Reprodución automática de GIFs animados setting_boost_modal: Pedir confirmación antes de promocionar setting_crop_images: Recortar imaxes a 16x9 en publicacións non despregadas diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 3e2e930a7..35045e9c3 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -46,7 +46,7 @@ th: setting_display_media_hide_all: ซ่อนสื่อเสมอ setting_display_media_show_all: แสดงสื่อเสมอ setting_hide_network: จะซ่อนผู้ที่คุณติดตามและผู้ที่ติดตามคุณในโปรไฟล์ของคุณ - setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าสถานะของคุณ + setting_noindex: มีผลต่อโปรไฟล์สาธารณะและหน้าโพสต์ของคุณ setting_show_application: จะแสดงแอปพลิเคชันที่คุณใช้ในการโพสต์ในมุมมองโดยละเอียดของโพสต์ของคุณ setting_use_blurhash: การไล่ระดับสีอิงตามสีของภาพที่ซ่อนอยู่แต่ทำให้รายละเอียดใด ๆ คลุมเครือ setting_use_pending_items: ซ่อนการอัปเดตเส้นเวลาไว้หลังการคลิกแทนที่จะเลื่อนฟีดโดยอัตโนมัติ @@ -184,18 +184,18 @@ th: severity: กฎ notification_emails: digest: ส่งอีเมลสรุป - favourite: ใครสักคนได้ชื่นชอบสถานะของคุณ + favourite: ใครสักคนได้ชื่นชอบโพสต์ของคุณ follow: ใครสักคนได้ติดตามคุณ follow_request: ใครสักคนได้ขอติดตามคุณ mention: ใครสักคนได้กล่าวถึงคุณ pending_account: บัญชีใหม่ต้องมีการตรวจทาน - reblog: ใครสักคนได้ดันสถานะของคุณ + reblog: ใครสักคนได้ดันโพสต์ของคุณ report: มีการส่งรายงานใหม่ trending_tag: แฮชแท็กที่ยังไม่ได้ตรวจทานกำลังนิยม rule: text: กฎ tag: - listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและในไดเรกทอรีโปรไฟล์ + listable: อนุญาตให้แฮชแท็กนี้ปรากฏในการค้นหาและข้อเสนอแนะ name: แฮชแท็ก trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้ diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 30bd0ac6e..d9c990de2 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -3,7 +3,7 @@ zh-CN: simple_form: hints: account_alias: - acct: 指定您想要迁移过来的原帐号：用户名@站点域名 + acct: 指定你想要迁移过来的原帐号：用户名@站点域名 account_migration: acct: 指定你想迁移过去的目标帐号：用户名@站点域名 account_warning_preset: @@ -74,7 +74,7 @@ zh-CN: ip_block: comment: 可选。请记住为什么你添加了此规则。 expires_in: IP 地址是一种有限的资源，它们有时是共享的，并且常常变化。因此，不推荐无限期的 IP 封禁。 - ip: 输入 IPv4 或 IPv6 地址。你可以使用 CIDR 语法屏蔽整个范围。小心不要屏蔽自己！ + ip: 输入 IPv4 或 IPv6 地址。你可以使用CIDR语法屏蔽IP段。小心不要屏蔽自己！ severities: no_access: 阻止访问所有资源 sign_up_requires_approval: 新注册需要你的批准 @@ -101,7 +101,7 @@ zh-CN: text: 预置文本 title: 标题 admin_account_action: - include_statuses: 在电子邮件中包括已报告的嘟文 + include_statuses: 在电子邮件中包括已举报的嘟文 send_email_notification: 通过邮件提醒此用户 text: 内容警告 type: 动作 @@ -145,7 +145,7 @@ zh-CN: otp_attempt: 双重认证代码 password: 密码 phrase: 关键词 - setting_advanced_layout: 启用高级 Web 界面 + setting_advanced_layout: 启用高级web界面 setting_aggregate_reblogs: 在时间轴中合并转嘟 setting_auto_play_gif: 自动播放 GIF 动画 setting_boost_modal: 在转嘟前询问我 @@ -203,7 +203,7 @@ zh-CN: mention: 当有用户在嘟文中提及我时，发送电子邮件提醒我 pending_account: 在有帐号需要审核时，发送电子邮件提醒我 reblog: 当有用户转嘟了我的嘟文时，发送电子邮件提醒我 - report: 在提交新报告时，发送电子邮件提醒我 + report: 在提交新举报时，发送电子邮件提醒我 trending_tag: 当未经审核的话题成为当前热门时发邮件提醒 rule: text: 规则 diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml index ec2d62e24..b815f42c7 100644 --- a/config/locales/simple_form.zh-TW.yml +++ b/config/locales/simple_form.zh-TW.yml @@ -8,16 +8,18 @@ zh-TW: acct: 指定欲移動至之帳戶的 使用者名稱@站台 account_warning_preset: text: 您可使用嘟文語法，例如網址、「#」標籤和提及功能 + title: 可選。不會向收件者顯示 admin_account_action: + include_statuses: 使用者可看到導致檢舉或警告的嘟文 send_email_notification: 使用者將收到帳戶發生之事情的解釋 text_html: 選用。您能使用嘟文語法。您可 新增警告預設 來節省時間 type_html: 設定要使用 %{acct} 做的事 types: - disable: 禁止該使用者使用他們的帳號，但是不刪除或隱藏他們的內容。 + disable: 禁止該使用者使用他們的帳戶，但是不刪除或隱藏他們的內容。 none: 使用這個寄送警告給該使用者，而不進行其他動作。 sensitive: 強制標記此使用者所有媒體為敏感內容。 - silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳號中隱藏嘟文和通知。 - suspend: 禁止所有對該帳號任何互動，並且刪除其內容。三十日內可以撤回。 + silence: 禁止該使用者發公開嘟文，從無跟隨他們的帳戶中隱藏嘟文和通知。 + suspend: 禁止所有對該帳戶任何互動，並且刪除其內容。三十日內可以撤回。 warning_preset_id: 選用。您仍可在預設的結尾新增自訂文字 announcement: all_day: 核取後，只會顯示出時間範圍中的日期部分 @@ -96,7 +98,7 @@ zh-TW: defaults: autofollow: 邀請別人關注你的帳戶 avatar: 大頭貼 - bot: 此帳號是台機器人 + bot: 此帳戶是台機器人 chosen_languages: 過濾語言 confirm_new_password: 確認新密碼 confirm_password: 確認密碼 @@ -105,14 +107,14 @@ zh-TW: data: 資料 discoverable: 在目錄列出此帳戶 display_name: 顯示名稱 - email: 電子信箱位址 + email: 電子信箱地址 expires_in: 失效時間 fields: 個人資料中繼資料 header: 頁面頂端 inbox_url: 中繼收件匣的 URL irreversible: 放棄而非隱藏 locale: 介面語言 - locked: 鎖定帳號 + locked: 鎖定帳戶 max_uses: 最大使用次數 new_password: 新密碼 note: 簡介 @@ -127,6 +129,7 @@ zh-TW: setting_default_privacy: 嘟文可見範圍 setting_default_sensitive: 總是將媒體標記為敏感內容 setting_delete_modal: 刪除嘟文前先詢問我 + setting_disable_swiping: 停用滑動手勢 setting_display_media: 媒體顯示 setting_display_media_default: 預設 setting_display_media_hide_all: 全部隱藏 @@ -140,12 +143,16 @@ zh-TW: setting_theme: 站點主題 setting_trends: 顯示本日趨勢 setting_unfollow_modal: 取消關注某人前先詢問我 + setting_use_blurhash: 將隱藏媒體以彩色漸變圖樣表示 setting_use_pending_items: 限速模式 severity: 優先級 + sign_in_token_attempt: 安全代碼 type: 匯入類型 username: 使用者名稱 - username_or_email: 使用者名稱或電子信箱位址 + username_or_email: 使用者名稱或電子信箱地址 whole_word: 整個詞彙 + email_domain_block: + with_dns_records: 包括網域的 MX 記錄和 IP 位址 featured_tag: name: "「#」標籤" interactions: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 27e2ecfe1..c00d1915c 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -158,7 +158,7 @@ sv: protocol: Protokoll public: Offentlig push_subscription_expires: PuSH-prenumerationen löper ut - redownload: Uppdatera avatar + redownload: Uppdatera profil reject: Förkasta reject_all: Förkasta allt / Avvisa alla remove_avatar: Ta bort avatar @@ -173,6 +173,7 @@ sv: role: Behörigheter roles: admin: Administratör + moderator: Moderator staff: Personal user: Användare search: Sök @@ -215,7 +216,7 @@ sv: destroy_custom_emoji: Radera egen emoji destroy_domain_allow: Ta bort tillåten domän destroy_domain_block: Ta bort blockerad domän - destroy_ip_block: Ta bort IP-regel + destroy_ip_block: Radera IP-regel destroy_status: Ta bort status disable_2fa_user: Inaktivera 2FA disable_custom_emoji: Inaktivera egna emojis @@ -238,12 +239,15 @@ sv: update_status: Uppdatera status deleted_status: "(raderad status)" empty: Inga loggar hittades. + filter_by_action: Filtrera efter åtgärd + filter_by_user: Filtrera efter användare title: Revisionslogg announcements: live: Direkt + publish: Publicera scheduled_for: Schemalagd för %{time} custom_emojis: - assign_category: Ange kategori + assign_category: Tilldela kategori by_domain: Domän copied_msg: Skapade en lokal kopia av emoji utan problem copy: Kopia @@ -255,6 +259,7 @@ sv: disable: Inaktivera disabled: Inaktiverad disabled_msg: Inaktiverade emoji utan problem + emoji: Emoji enable: Aktivera enabled: Aktiverad enabled_msg: Aktiverade den emoji utan problem @@ -384,7 +389,8 @@ sv: title: Filtrera title: Inbjudningar ip_blocks: - delete: Ta bort + add_new: Skapa regel + delete: Radera expires_in: '1209600': 2 veckor '15778476': 6 månader @@ -410,6 +416,10 @@ sv: created_msg: Anmälningsanteckning har skapats! destroyed_msg: Anmälningsanteckning har raderats! reports: + account: + reports: + one: "%{count} rapport" + other: "%{count} rapporter" action_taken_by: Åtgärder vidtagna av are_you_sure: Är du säker? assign_to_self: Tilldela till mig @@ -440,7 +450,7 @@ sv: updated_at: Uppdaterad rules: add_new: Lägg till regel - delete: Ta bort + delete: Radera edit: Ändra regel title: Serverns regler settings: @@ -479,7 +489,7 @@ sv: desc_html: Visas på framsidan när registreringen är stängd. Du kan använda HTML-taggar title: Stängt registreringsmeddelande deletion: - desc_html: Tillåt alla att ta bort sitt konto + desc_html: Tillåt vem som helst att radera sitt konto title: Öppen kontoradering min_invite_role: disabled: Ingen @@ -531,6 +541,7 @@ sv: last_active: Senast aktiv name: Hashtag title: Hashtaggar + trending_right_now: Trenderar just nu unreviewed: Ej granskad title: Administration warning_presets: @@ -550,6 +561,7 @@ sv: discovery: Upptäck localization: body: Mastodon översätts av volontärer. + guide_link: https://crowdin.com/project/mastodon guide_link_text: Alla kan bidra. sensitive_content: Känsligt innehåll application_mailer: @@ -570,10 +582,11 @@ sv: auth: apply_for_account: Be om en inbjudan change_password: Lösenord - delete_account: Ta bort konto + delete_account: Radera konto delete_account_html: Om du vill radera ditt konto kan du fortsätta här. Du kommer att bli ombedd att bekräfta. description: prefix_invited_by_user: "@%{name} bjuder in dig att gå med i en Mastodon-server!" + prefix_sign_up: Registrera dig på Mastodon idag! didnt_get_confirmation: Fick du inte instruktioner om bekräftelse? forgot_password: Glömt ditt lösenord? invalid_reset_password_token: Lösenordsåterställningstoken är ogiltig eller utgått. Vänligen be om en ny. @@ -631,10 +644,13 @@ sv: x_seconds: "%{count}sek" deletes: confirm_password: Ange ditt lösenord för att verifiera din identitet - proceed: Ta bort konto + proceed: Radera konto success_msg: Ditt konto har raderats warning: + email_change_html: Du kan ändra din e-postadress utan att radera ditt konto irreversible: Du kan inte återställa eller återaktivera ditt konto + directories: + explore_mastodon: Utforska %{title} domain_validator: invalid_domain: är inte ett giltigt domännamn errors: @@ -684,11 +700,13 @@ sv: footer: developers: Utvecklare more: Mer… + resources: Resurser + trending_now: Trendar nu generic: all: Alla changes_saved_msg: Ändringar sparades framgångsrikt! copy: Kopiera - delete: Ta bort + delete: Radera order_by: Sortera efter save_changes: Spara ändringar validation_errors: @@ -744,6 +762,7 @@ sv: acct: användarnamn@domän av det nya kontot cancel_explanation: Avstängning av omdirigeringen kommer att återaktivera ditt nuvarande konto, men kommer inte att återskapa följare som har flyttats till det kontot. incoming_migrations: Flyttar från ett annat konto + proceed_with_move: Flytta följare redirected_msg: Ditt konto dirigeras om till %{acct}. moderation: title: Moderera @@ -785,11 +804,14 @@ sv: subject: "%{name} publicerade nyss" notifications: other_settings: Andra aviseringsinställningar + otp_authentication: + enable: Aktivera pagination: newer: Nyare next: Nästa older: Äldre prev: Tidigare + truncate: "…" polls: errors: invalid_choice: Det valda röstalternativet finns inte @@ -806,6 +828,7 @@ sv: remote_follow: acct: Ange ditt användarnamn@domän du vill följa från missing_resource: Det gick inte att hitta den begärda omdirigeringsadressen för ditt konto + no_account_html: Har du inget konto? Du kan registrera dig här proceed: Fortsätt för att följa prompt: 'Du kommer att följa:' reason_html: "Varför är det här steget nödvändigt?%{instance} är kanske inte den server du är registrerad vid, så vi behöver dirigera dig till din hemserver först."
@@ -813,13 +836,29 @@ sv:
activity: Senaste aktivitet
browser: Webbläsare
browsers:
+ alipay: Alipay
+ blackberry: Blackberry
+ chrome: Chrome
+ edge: Microsoft Edge
+ electron: Electron
+ firefox: Firefox
generic: Okänd browser
+ ie: Internet Explorer
+ opera: Opera
+ safari: Safari
current_session: Nuvarande session
description: "%{browser} på %{platform}"
explanation: Detta är inloggade webbläsare på Mastodon just nu.
platforms:
+ android: Android
+ blackberry: Blackberry
+ chrome_os: Chrome OS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
mac: Mac
other: okänd plattform
+ windows: Windows
revoke: Återkalla
revoke_success: Sessionen återkallas framgångsrikt
title: Sessioner
@@ -841,6 +880,7 @@ sv:
profile: Profil
relationships: Följer och följare
two_factor_authentication: Tvåfaktorsautentisering
+ webauthn_authentication: Säkerhetsnycklar
statuses:
attached:
description: 'Bifogad: %{attached}'
@@ -862,8 +902,18 @@ sv:
ownership: Någon annans toot kan inte fästas
private: Icke-offentliga toot kan inte fästas
reblog: Knuffar kan inte fästas
+ poll:
+ total_people:
+ one: "%{count} person"
+ other: "%{count} personer"
+ total_votes:
+ one: "%{count} röst"
+ other: "%{count} röster"
+ vote: Rösta
show_more: Visa mer
show_thread: Visa tråd
+ sign_in_to_participate: Logga in för att delta i konversationen
+ title: '%{name}: "%{quote}"'
visibilities:
private: Endast följare
private_long: Visa endast till följare
@@ -963,7 +1013,9 @@ sv:
default: Mastodon
mastodon-light: Mastodon (ljust)
two_factor_authentication:
+ add: Lägg till
disable: Inaktivera
+ edit: Redigera
enabled: Tvåfaktorsautentisering är aktiverad
enabled_success: Tvåfaktorsautentisering aktiverad
generate_recovery_codes: Generera återställningskoder
@@ -971,11 +1023,15 @@ sv:
recovery_codes: Backup återställningskod
recovery_codes_regenerated: Återställningskoder genererades på nytt
recovery_instructions_html: Om du någonsin tappar åtkomst till din telefon kan du använda någon av återställningskoderna nedan för att återställa åtkomst till ditt konto. Håll återställningskoderna säkra . Du kan till exempel skriva ut dem och lagra dem med andra viktiga dokument.
+ webauthn: Säkerhetsnycklar
user_mailer:
backup_ready:
explanation: Du begärde en fullständig säkerhetskopiering av ditt Mastodon-konto. Det är nu klart för nedladdning!
subject: Ditt arkiv är klart för nedladdning
title: Arkivuttagning
+ warning:
+ title:
+ none: Varning
welcome:
edit_profile_action: Profilinställning
edit_profile_step: Du kan anpassa din profil genom att ladda upp en avatar, bakgrundsbild, ändra ditt visningsnamn och mer. Om du vill granska nya följare innan de får följa dig kan du låsa ditt konto.
@@ -993,12 +1049,15 @@ sv:
tip_mobile_webapp: Om din mobila webbläsare erbjuder dig att lägga till Mastodon på din hemskärm kan du få push-aviseringar. Det fungerar som en inbyggd app på många sätt!
title: Välkommen ombord, %{name}!
users:
+ follow_limit_reached: Du kan inte följa fler än %{limit} personer
invalid_otp_token: Ogiltig tvåfaktorskod
otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
seamless_external_login: Du är inloggad via en extern tjänst, så lösenord och e-postinställningar är inte tillgängliga.
signed_in_as: 'Inloggad som:'
webauthn_credentials:
- delete: Ta bort
+ add: Lägg till ny säkerhetsnyckel
+ delete: Radera
delete_confirmation: Är du säker på att du vill ta bort denna säkerhetsnyckel?
destroy:
- success: Din säkerhetsnyckel har tagits bort.
+ success: Din säkerhetsnyckel har raderats.
+ not_enabled: Du har inte aktiverat WebAuthn än
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5a3ae4988..89a553c46 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -2,7 +2,7 @@
th:
about:
about_hashtag_html: มีการแท็กโพสต์สาธารณะเหล่านี้ด้วย #%{hashtag} คุณสามารถโต้ตอบกับโพสต์หากคุณมีบัญชีที่ใดก็ตามในเฟดิเวิร์ส
- about_mastodon_html: 'เครือข่ายสังคมแห่งอนาคต: ไม่มีโฆษณา, ไม่มีการสอดแนมโดยองค์กร, การออกแบบตามหลักจริยธรรม และการกระจายศูนย์! เป็นเจ้าของข้อมูลของคุณด้วย Mastodon!'
+ about_mastodon_html: 'เครือข่ายสังคมแห่งอนาคต: ไม่มีโฆษณา ไม่มีการสอดแนมโดยองค์กร การออกแบบตามหลักจริยธรรม และการกระจายศูนย์! เป็นเจ้าของข้อมูลของคุณด้วย Mastodon!'
about_this: เกี่ยวกับ
active_count_after: ใช้งานอยู่
active_footnote: ผู้ใช้งานรายเดือน (MAU)
@@ -620,7 +620,7 @@ th:
accounts_week: การใช้งานที่ไม่ซ้ำกันในสัปดาห์นี้
last_active: ใช้งานล่าสุด
most_popular: ยอดนิยม
- most_recent: ล่าสุด
+ most_recent: สร้างล่าสุด
name: แฮชแท็ก
review: สถานะการตรวจทาน
reviewed: ตรวจทานแล้ว
@@ -1023,6 +1023,7 @@ th:
platforms:
adobe_air: Adobe Air
android: Android
+ chrome_os: Chrome OS
firefox_os: Firefox OS
ios: iOS
linux: Linux
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0bfbf5a6c..34cc2988d 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -25,7 +25,7 @@ vi:
learn_more: Tìm hiểu
privacy_policy: Chính sách bảo mật
rules: Quy tắc máy chủ
- rules_html: 'Bên dưới là mô tả những quy tắc trên máy chủ Mastodon này, bạn phải đọc kỹ trước khi đăng ký:'
+ rules_html: 'Bên dưới là những quy tắc của máy chủ Mastodon này, bạn phải đọc kỹ trước khi đăng ký:'
see_whats_happening: Dòng thời gian
server_stats: 'Thống kê:'
source_code: Mã nguồn
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d9730d9f1..b9c07bd29 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -18,14 +18,14 @@ zh-CN:
contact_unavailable: 未公开
discover_users: 发现用户
documentation: 文档
- federation_hint_html: 在 %{instance} 上拥有账号后，你可以关注任何兼容 Mastodon 服务器上的人。
+ federation_hint_html: 在 %{instance} 上拥有账号后，你可以关注任何兼容Mastodon的服务器上的人。
get_apps: 尝试移动应用
hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例
instance_actor_flash: "这个账号是个虚拟帐号，不代表任何用户，只用来代表服务器本身。它用于和其它服务器互通，所以不应该被封禁，除非你想封禁整个实例。但是想封禁整个实例的时候，你应该用域名封禁。 \n"
learn_more: 了解详情
privacy_policy: 隐私政策
rules: 服务器规则
- rules_html: 如果你想要在此 Mastodon 服务器上拥有一个账户，你必须遵守相应的规则，摘要如下：
+ rules_html: 如果你想要在此Mastodon服务器上拥有一个账户，你必须遵守相应的规则，摘要如下：
see_whats_happening: 看一看现在在发生什么
server_stats: 服务器统计数据：
source_code: 源代码
@@ -51,7 +51,7 @@ zh-CN:
what_is_mastodon: Mastodon 是什么？
accounts:
choices_html: "%{name} 的推荐："
- endorsements_hint: 你可以在 Web 界面上推荐你关注的人，他们会显示在这里。
+ endorsements_hint: 你可以在web界面上推荐你关注的人，他们会显示在这里。
featured_tags_hint: 你可以精选一些话题标签展示在这里。
follow: 关注
followers:
@@ -189,8 +189,8 @@ zh-CN:
sensitized: 已标记为敏感内容
shared_inbox_url: 公用收件箱（Shared Inbox）URL
show:
- created_reports: 这个帐户提交的报告
- targeted_reports: 针对这个帐户的报告
+ created_reports: 这个帐户提交的举报
+ targeted_reports: 针对这个帐户的举报
silence: 隐藏
silenced: 已隐藏
statuses: 嘟文
@@ -214,7 +214,7 @@ zh-CN:
whitelisted: 允许跨站交互
action_logs:
action_types:
- assigned_to_self_report: 指派报告
+ assigned_to_self_report: 指派举报
change_email_user: 为用户修改邮箱地址
confirm_user: 确认用户
create_account_warning: 创建警告
@@ -242,13 +242,13 @@ zh-CN:
memorialize_account: 将账户设为追悼模式
promote_user: 给用户升任
remove_avatar_user: 移除头像
- reopen_report: 重开报告
+ reopen_report: 重开举报
reset_password_user: 重置密码
- resolve_report: 处理报告
+ resolve_report: 处理举报
sensitive_account: 将你帐号中的媒体标记为敏感内容
silence_account: 隐藏用户
suspend_account: 封禁用户
- unassigned_report: 取消报告的指派
+ unassigned_report: 取消举报的指派
unsensitive_account: 去除你帐号中媒体的敏感内容标记
unsilence_account: 解除账号隐藏
unsuspend_account: 解除账号封禁
@@ -257,7 +257,7 @@ zh-CN:
update_domain_block: 更新域名屏蔽
update_status: 更新嘟文
actions:
- assigned_to_self_report_html: "%{name} 接管了报告 %{target}"
+ assigned_to_self_report_html: "%{name} 接管了举报 %{target}"
change_email_user_html: "%{name} 更改了用户 %{target} 的电子邮件地址"
confirm_user_html: "%{name} 确认了用户 %{target} 的电子邮件地址"
create_account_warning_html: "%{name} 向 %{target} 发送了警告"
@@ -285,13 +285,13 @@ zh-CN:
memorialize_account_html: "%{name} 将 %{target} 设置为追悼帐户"
promote_user_html: "%{name} 对用户 %{target} 进行了升任操作"
remove_avatar_user_html: "%{name} 删除了 %{target} 的头像"
- reopen_report_html: "%{name} 重开了报告 %{target}"
+ reopen_report_html: "%{name} 重开了举报 %{target}"
reset_password_user_html: "%{name} 重置了用户 %{target} 的密码"
- resolve_report_html: "%{name} 处理了报告 %{target}"
+ resolve_report_html: "%{name} 处理了举报 %{target}"
sensitive_account_html: "%{name} 将 %{target} 的媒体标记为敏感内容"
silence_account_html: "%{name} 隐藏了用户 %{target}"
suspend_account_html: "%{name} 封禁了用户 %{target}"
- unassigned_report_html: "%{name} 放弃接管报告 %{target}"
+ unassigned_report_html: "%{name} 放弃接管举报 %{target}"
unsensitive_account_html: "%{name} 去除了 %{target} 的媒体的敏感内容标记"
unsilence_account_html: "%{name} 解除了用户 %{target} 的隐藏状态"
unsuspend_account_html: "%{name} 解除了用户 %{target} 的封禁状态"
@@ -366,7 +366,7 @@ zh-CN:
feature_timeline_preview: 时间轴预览
features: 功能
hidden_service: 匿名服务连通性
- open_reports: 待处理报告数
+ open_reports: 待处理举报数
pending_tags: 等待审核的标签
pending_users: 等待审核的用户
recent_users: 新用户
@@ -410,10 +410,10 @@ zh-CN:
public_comment_hint: 给这一域名限制添加公开的评论，如果你推广你的域名限制列表的话，这些评论就会显示出来。
reject_media: 拒绝接收媒体文件
reject_media_hint: 删除本站已缓存的媒体文件，并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
- reject_reports: 拒绝接收报告
- reject_reports_hint: 忽略来自此域名的所有报告。这和封禁无关。
+ reject_reports: 拒绝接收举报
+ reject_reports_hint: 忽略来自此域名的所有举报。这和封禁无关。
rejecting_media: 拒绝接收媒体文件
- rejecting_reports: 拒绝接收报告
+ rejecting_reports: 拒绝接收举报
severity:
silence: 已隐藏
suspend: 已封禁
@@ -440,7 +440,7 @@ zh-CN:
title: 添加电子邮件域名屏蔽
title: 电子邮件域名屏蔽
follow_recommendations:
- description_html: "“关注推荐”帮助新用户快速找到有趣的内容。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账户。每日都会更新推荐，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。"
+ description_html: "“关注推荐”可帮助新用户快速找到有趣的内容。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账户。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。"
language: 选择语言
status: 嘟文
suppress: 禁用推荐关注
@@ -449,12 +449,12 @@ zh-CN:
unsuppress: 恢复推荐关注
instances:
back_to_all: 全部
- back_to_limited: 隐藏
+ back_to_limited: 受限
back_to_warning: 警告
by_domain: 域名
delivery:
all: 全部
- clear: 清除投递错误
+ clear: 清理投递错误
restart: 重新投递
stop: 停止投递
title: 投递
@@ -479,7 +479,7 @@ zh-CN:
total_blocked_by_us: 被我站屏蔽的
total_followed_by_them: 被对方关注的
total_followed_by_us: 被我站关注的
- total_reported: 关于对方的报告
+ total_reported: 关于对方的举报
total_storage: 媒体文件
invites:
deactivate_all: 撤销所有邀请链接
@@ -525,8 +525,8 @@ zh-CN:
status: 状态
title: 中继站
report_notes:
- created_msg: 报告记录建立成功！
- destroyed_msg: 报告记录删除成功！
+ created_msg: 举报记录建立成功！
+ destroyed_msg: 举报记录删除成功！
reports:
account:
notes:
@@ -537,10 +537,10 @@ zh-CN:
are_you_sure: 你确定吗？
assign_to_self: 接管
assigned: 已接管的监察员
- by_target_domain: 被报告账户的域名
+ by_target_domain: 被举报账户的域名
comment:
none: 没有
- created_at: 报告时间
+ created_at: 举报时间
forwarded: 已转发
forwarded_to: 转发举报至 %{domain}
mark_as_resolved: 标记为“已处理”
@@ -551,14 +551,14 @@ zh-CN:
create_and_unresolve: 添加记录并重开
delete: 删除
placeholder: 描述已经执行的操作，或其他任何相关的跟进情况…
- reopen: 重开报告
- report: '报告 #%{id}'
- reported_account: 报告用户
- reported_by: 报告人
+ reopen: 重开举报
+ report: '举报 #%{id}'
+ reported_account: 举报用户
+ reported_by: 举报人
resolved: 已处理
- resolved_msg: 报告处理成功！
+ resolved_msg: 举报处理成功！
status: 状态
- title: 报告
+ title: 举报
unassign: 取消接管
unresolved: 未处理
updated_at: 更新时间
@@ -710,9 +710,9 @@ zh-CN:
body: 新帐户的详细信息如下。你可以批准或拒绝此申请。
subject: 在 %{instance} 上有新帐号 ( %{username}) 需要审核
new_report:
- body: "%{reporter} 报告了用户 %{target}"
- body_remote: 来自 %{domain} 的用户报告了用户 %{target}
- subject: 来自 %{instance} 的用户报告（#%{id}）
+ body: "%{reporter} 举报了用户 %{target}"
+ body_remote: 来自 %{domain} 的用户举报了用户 %{target}
+ subject: 来自 %{instance} 的用户举报（#%{id}）
new_trending_tag:
body: '今日的热门话题 #%{name} 之前未经审核。直到你允许之前这个话题将不会公开显示，或者就保持原样让它石沉大海。'
subject: 在 %{instance} 有新话题 (#%{name}) 待审核
@@ -724,8 +724,8 @@ zh-CN:
hint_html: 如果你想把另一个帐号迁移到这里，你可以先在这里创建一个别名。如果你想把关注者迁移过来，这一步是必须的。设置别名的操作时无害而且可以恢复的。帐号迁移的操作会从旧帐号开始。
remove: 取消关联别名
appearance:
- advanced_web_interface: 高级 Web 界面
- advanced_web_interface_hint: 如果你想使用整个屏幕宽度，高级 Web 界面允许你配置多个不同的栏目，可以同时看到更多的信息：主页、通知、跨站时间轴、任意数量的列表和话题标签。
+ advanced_web_interface: 高级web界面
+ advanced_web_interface_hint: 如果你想使用整个屏幕宽度，高级 web 界面允许您配置多个不同的栏目，可以同时看到更多的信息：主页、通知、跨站时间轴、任意数量的列表和话题标签。
animations_and_accessibility: 动画和访问选项
confirmation_dialogs: 确认对话框
discovery: 发现
@@ -887,7 +887,7 @@ zh-CN:
csv: CSV
domain_blocks: 域名屏蔽
lists: 列表
- mutes: 你静音的用户
+ mutes: 你隐藏的用户
storage: 媒体文件存储
featured_tags:
add_new: 添加新条目
@@ -1031,7 +1031,7 @@ zh-CN:
title: 运营
move_handler:
carry_blocks_over_text: 这个用户迁移自你屏蔽过的 %{acct}
- carry_mutes_over_text: 这个用户迁移自你静音过的 %{acct}
+ carry_mutes_over_text: 这个用户迁移自你隐藏过的 %{acct}
copy_account_note_text: 这个用户迁移自 %{acct}，你曾为其添加备注：
notification_mailer:
digest:
@@ -1445,8 +1445,8 @@ zh-CN:
error: 删除你的安全密钥时出错。请重试。
success: 你的安全密钥已成功删除。
invalid_credential: 无效的安全密钥
- nickname_hint: 输入你新安全密钥的昵称
- not_enabled: 你尚未启用 WebAuthn
+ nickname_hint: 输入你的新安全密钥的昵称
+ not_enabled: 你尚未启用WebAuthn
not_supported: 此浏览器不支持安全密钥
otp_required: 要使用安全密钥，请先启用两步验证。
registered_on: 注册于 %{date}
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index c01d566b7..852c333ca 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -25,7 +25,7 @@ zh-TW:
learn_more: 了解詳細
privacy_policy: 隱私權政策
rules: 伺服器規則
- rules_html: 以下是您若想在此 Mastodon 伺服器建立帳號必須遵守的規則總結：
+ rules_html: 以下是您若想在此 Mastodon 伺服器建立帳戶必須遵守的規則總結：
see_whats_happening: 看看發生什麼事
server_stats: 伺服器統計：
source_code: 原始碼
@@ -57,7 +57,7 @@ zh-TW:
followers:
other: 關注者
following: 正在關注
- instance_actor_flash: 這個帳號是一個用來代表此伺服器的虛擬執行者，而非真實使用者。它用途為站點聯盟且不應被停權。
+ instance_actor_flash: 這個帳戶是一個用來代表此伺服器的虛擬執行者，而非真實使用者。它用途為站點聯盟且不應被停權。
joined: 加入於 %{date}
last_active: 上次活躍時間
link_verified_on: 此連結的所有權已在 %{date} 檢查過
@@ -99,12 +99,12 @@ zh-TW:
avatar: 頭像
by_domain: 站點
change_email:
- changed_msg: 已成功變更帳戶電子信箱位址！
- current_email: 目前的電子信箱位址
- label: 變更電子信箱位址
- new_email: 新的電子信箱位址
- submit: 變更電子信箱位址
- title: 為 %{username} 變更電子信箱位址
+ changed_msg: 已成功變更帳戶電子信箱地址！
+ current_email: 目前的電子信箱地址
+ label: 變更電子信箱地址
+ new_email: 新的電子信箱地址
+ submit: 變更電子信箱地址
+ title: 為 %{username} 變更電子信箱地址
confirm: 確定
confirmed: 已確定
confirming: 確定
@@ -118,7 +118,7 @@ zh-TW:
display_name: 暱稱
domain: 站點
edit: 編輯
- email: 電子信箱位址
+ email: 電子信箱地址
email_status: 電子信箱狀態
enable: 啟用
enabled: 已啟用
@@ -140,7 +140,7 @@ zh-TW:
media_attachments: 多媒體附件
memorialize: 設定為追悼帳戶
memorialized: 被悼念的
- memorialized_msg: 成功將%{username} 的帳號變為紀念帳號
+ memorialized_msg: 成功將%{username} 的帳戶變為紀念帳戶
moderation:
active: 活躍
all: 全部
@@ -151,7 +151,7 @@ zh-TW:
moderation_notes: 管理備忘
most_recent_activity: 最近活動
most_recent_ip: 最近 IP 位址
- no_account_selected: 未選取任何帳號，因此未變更
+ no_account_selected: 未選取任何帳戶，因此未變更
no_limits_imposed: 未受限制
not_subscribed: 未訂閱
pending: 等待審核中
@@ -164,7 +164,7 @@ zh-TW:
redownloaded_msg: 成功重新載入%{username} 的個人資料頁面
reject: 拒絕
reject_all: 全部拒絕
- rejected_msg: 成功拒絕了%{username} 的新帳號申請
+ rejected_msg: 成功拒絕了%{username} 的新帳戶申請
remove_avatar: 取消頭像
remove_header: 移除開頭
removed_avatar_msg: 成功刪除了 %{username} 的頭像
@@ -200,7 +200,7 @@ zh-TW:
suspension_reversible_hint_html: 這個帳戶已被暫停，所有數據將會在 %{date} 被刪除。在此之前，您可以完全回復您的帳戶。如果您想即時刪除這個帳戶的數據，您可以在下面進行操作。
time_in_queue: 正在佇列等待 %{time}
title: 帳戶
- unconfirmed_email: 未確認的電子信箱位址
+ unconfirmed_email: 未確認的電子信箱地址
undo_sensitized: 取消敏感狀態
undo_silenced: 取消靜音
undo_suspension: 取消停權
@@ -215,7 +215,7 @@ zh-TW:
action_logs:
action_types:
assigned_to_self_report: 指派回報
- change_email_user: 變更使用者的電子信箱位址
+ change_email_user: 變更使用者的電子信箱地址
confirm_user: 確認使用者
create_account_warning: 建立警告
create_announcement: 建立公告
@@ -237,17 +237,17 @@ zh-TW:
disable_user: 停用帳戶
enable_custom_emoji: 啓用自訂顏文字
enable_user: 啓用帳戶
- memorialize_account: 設定成紀念帳號
+ memorialize_account: 設定成紀念帳戶
promote_user: 把用戶升級
remove_avatar_user: 刪除大頭貼
reopen_report: 重開舉報
reset_password_user: 重設密碼
resolve_report: 消除舉報
- sensitive_account: 把您的帳號的媒體標記為敏感內容
+ sensitive_account: 把您的帳戶的媒體標記為敏感內容
silence_account: 靜音用戶
suspend_account: 暫停用戶
unassigned_report: 取消指派舉報
- unsensitive_account: 取消把您的帳號的媒體設定為敏感內容
+ unsensitive_account: 取消把您的帳戶的媒體設定為敏感內容
unsilence_account: 取消用戶的靜音狀態
unsuspend_account: 取消用戶的暫停狀態
update_announcement: 更新公告
@@ -393,7 +393,12 @@ zh-TW:
title: 新增電子信箱黑名單項目
title: 電子信箱黑名單
instances:
+ back_to_all: 所有
+ back_to_warning: 警告
by_domain: 站台
+ delivery:
+ all: 所有
+ warning: 警告
delivery_available: 可傳送
empty: 找不到網域
known_accounts:
@@ -466,7 +471,7 @@ zh-TW:
are_you_sure: 你確定嗎?
assign_to_self: 指派給自己
assigned: 指派負責人
- by_target_domain: 檢舉帳號之網域
+ by_target_domain: 檢舉帳戶之網域
comment:
none: 無
created_at: 日期
@@ -493,6 +498,7 @@ zh-TW:
updated_at: 更新
rules:
add_new: 新增規則
+ delete: 刪除
edit: 編輯規則
title: 伺服器規則
settings:
@@ -503,7 +509,7 @@ zh-TW:
desc_html: 以半形逗號分隔多個使用者名。只能加入來自本站且未開啟保護的帳戶。如果留空，則預設關注本站所有管理員。
title: 新使用者預設關注
contact_information:
- email: 用於聯絡的公開電子信箱位址
+ email: 用於聯絡的公開電子信箱地址
username: 請輸入使用者名稱
custom_css:
desc_html: 透過於每個頁面都載入的 CSS 調整外觀
@@ -632,8 +638,8 @@ zh-TW:
title: 管理預設警告
admin_mailer:
new_pending_account:
- body: 以下是新帳號的詳細資訊。您可以同意或拒絕這項申請。
- subject: "%{instance} 上有新帳號 (%{username}) 待審核"
+ body: 以下是新帳戶的詳細資訊。您可以同意或拒絕這項申請。
+ subject: "%{instance} 上有新帳戶 (%{username}) 待審核"
new_report:
body: "%{reporter} 檢舉了使用者 %{target}"
body_remote: 來自 %{domain} 的使用者檢舉了使用者 %{target}
@@ -643,10 +649,10 @@ zh-TW:
subject: "%{instance} 上有待審核的主題標籤 (#%{name})"
aliases:
add_new: 建立別名
- created_msg: 成功建立別名。您可以自舊帳號開始轉移。
- deleted_msg: 成功移除別名。您將無法再由舊帳號轉移到當前帳號。
+ created_msg: 成功建立別名。您可以自舊帳戶開始轉移。
+ deleted_msg: 成功移除別名。您將無法再由舊帳戶轉移到目前的帳戶。
empty: 您目前沒有任何別名。
- hint_html: 如果想由其他帳號轉移到此帳號，您可以在此處創建別名，稍後系統將容許您把關注者由舊帳號轉移至此。此項作業是無害且可復原的。 帳號的遷移程序需要在舊帳號啟動。
+ hint_html: 如果想由其他帳戶轉移到此帳戶，您可以在此處建立別名，稍後系統將容許您把關注者由舊帳戶轉移至此。此項作業是無害且可復原的。 帳戶的遷移程序需要在舊帳戶啟動。
remove: 取消連結別名
appearance:
advanced_web_interface: 進階網頁介面
@@ -684,8 +690,8 @@ zh-TW:
delete_account_html: 如果你想刪除你的帳戶，請點擊這裡繼續。你需要確認你的操作。
description:
prefix_invited_by_user: "@%{name} 邀請您加入這個 Mastodon 伺服器！"
- prefix_sign_up: 現在就註冊 Mastodon 帳號吧！
- suffix: 有了帳號，就可以從任何 Mastodon 伺服器關注任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交♂流？！
+ prefix_sign_up: 現在就註冊 Mastodon 帳戶吧！
+ suffix: 有了帳戶，就可以從任何 Mastodon 伺服器關注任何人、發發廢嘟，並且與任何 Mastodon 伺服器的使用者交流，以及更多！
didnt_get_confirmation: 沒有收到驗證信?
dont_have_your_security_key: 找不到您的安全金鑰？
forgot_password: 忘記密碼？
@@ -708,14 +714,14 @@ zh-TW:
set_new_password: 設定新密碼
setup:
email_below_hint_html: 如果此電子郵件地址不正確，您可於此修改並接收郵件進行認證。
- email_settings_hint_html: 請確認 e-mail 是否傳送到 %{email} 。如果不對的話，可以從帳號設定修改。
+ email_settings_hint_html: 請確認電子信件是否寄至 %{email} 。如果不對的話，可以在帳戶設定裡變更。
title: 設定
status:
- account_status: 帳號狀態
+ account_status: 帳戶狀態
confirming: 等待電子郵件確認完成。
- functional: 您的帳號可以正常使用了。
+ functional: 您的帳戶可以正常使用了。
pending: 管管們正在處理您的申請，這可能需要一點時間處理。我們將在申請通過後以電子郵件方式通知您。
- redirecting_to: 您的帳號因目前重定向至 %{acct} 而被停用。
+ redirecting_to: 您的帳戶因目前重新導向至 %{acct} 而被停用。
too_fast: 送出表單的速度太快跟不上，請稍後再試。
trouble_logging_in: 登錄時遇到困難？
use_security_key: 使用安全金鑰
@@ -768,10 +774,10 @@ zh-TW:
before: 在進行下一步驟之前，請詳細閱讀以下説明：
caches: 已被其他節點快取的內容可能會殘留其中
data_removal: 您的嘟文和其他資料將會被永久刪除
- email_change_html: 你可以在不刪除帳號的情況下變更你的電子郵件地址
+ email_change_html: 你可以在不刪除帳戶的情況下變更你的電子郵件地址
email_contact_html: 如果你仍然沒有收到郵件，請寄信到 %{email} 以獲得協助
email_reconfirmation_html: 如果你沒有收到確認郵件，你可以請求再次發送
- irreversible: 你將無法復原或重新啟用你的帳號
+ irreversible: 你將無法復原或重新啟用你的帳戶
more_details_html: 更多詳細資訊，請參閲隱私政策。
username_available: 你的使用者名稱將會釋出供他人使用
username_unavailable: 你的使用者名稱將會保留並不予他人使用
@@ -870,8 +876,8 @@ zh-TW:
inactive: 非活躍
publicize_checkbox: 並發嘟：
publicize_toot: 驗證成功！我在是住在 %{service} 的 %{username} ： %{url}
- remove: 移除帳號證明
- removed: 成功移除帳號證明
+ remove: 移除帳戶證明
+ removed: 成功移除帳戶證明
status: 驗證狀態
view_proof: 檢視證明
imports:
@@ -924,18 +930,19 @@ zh-TW:
migrations:
acct: 新帳戶的 使用者名稱@站點網域
cancel: 取消重導向
- cancel_explanation: 取消重導向將會重新啓用目前帳號，但不會還原已移至該帳號的關注者。
+ cancel_explanation: 取消重新導向將會重新啟用目前帳戶，但不會還原已移至該帳號的關注者。
cancelled_msg: 成功取消重導向。
errors:
already_moved: 與已經重導向的帳戶相同
- missing_also_known_as: 不是這個帳號的別名
- move_to_self: 不能是目前帳號
+ missing_also_known_as: 不是這個帳戶的別名
+ move_to_self: 不能是目前帳戶
not_found: 找不到
on_cooldown: 你正在處於冷卻（CD）狀態
followers_count: 轉移時的追隨者
- incoming_migrations: 自另一個帳號轉移
+ incoming_migrations: 自另一個帳戶轉移
proceed_with_move: 移動關注者
- redirected_msg: 您的帳號現在指向 %{acct}
+ redirected_msg: 您的帳戶現在指向 %{acct}
+ set_redirect: 設定重新導向
moderation:
title: 營運
notification_mailer:
@@ -975,6 +982,11 @@ zh-TW:
next: 下一頁
older: 較舊
prev: 上一頁
+ preferences:
+ other: 其他
+ relationships:
+ moved: 已轉移
+ status: 帳戶狀態
remote_follow:
acct: 請輸入您的使用者名稱@站點網域
missing_resource: 無法找到資源
@@ -1006,11 +1018,25 @@ zh-TW:
explanation: 這些是現在正登入於你的 Mastodon 帳戶的瀏覽器。
ip: IP 位址
platforms:
+ adobe_air: Adobe Air
+ android: Android
+ blackberry: 黑莓機 （Blackberry）
+ chrome_os: Chrome OS
+ firefox_os: Firefox OS
+ ios: iOS
+ linux: Linux
mac: Mac
+ other: 不明平台
+ windows: Windows
+ windows_mobile: Windows Mobile
+ windows_phone: Windows Phone
revoke: 取消
revoke_success: Session 取消成功
title: 作業階段
settings:
+ account: 帳戶
+ account_settings: 帳戶設定
+ aliases: 帳戶別名
appearance: 外觀設定
authorized_apps: 已授權應用程式
back: 回到 Mastodon
@@ -1019,7 +1045,9 @@ zh-TW:
edit_profile: 編輯使用者資訊
export: 匯出
featured_tags: 推薦標籤
+ identity_proofs: 身分驗證
import: 匯入
+ import_and_export: 匯入及匯出
migrate: 帳戶搬遷
notifications: 通知
preferences: 偏好設定
diff --git a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
index bd4f4c2a3..40537e9c9 100644
--- a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
+++ b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
@@ -1,6 +1,46 @@
class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
disable_ddl_transaction!
+ class StreamEntry < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :stream_entries
+ end
+
+ class Status < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :statuses
+ has_many :favourites, inverse_of: :status, dependent: :destroy
+ has_many :mentions, dependent: :destroy, inverse_of: :status
+ end
+
+ class Favourite < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :favourites
+ belongs_to :status, inverse_of: :favourites
+ end
+
+ class Mention < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, inverse_of: :mentions
+ belongs_to :status
+ end
+
+ class Notification < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ belongs_to :account, optional: true
+ belongs_to :from_account, class_name: 'Account', optional: true
+ belongs_to :activity, polymorphic: true, optional: true
+ end
+
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ has_many :stream_entries, inverse_of: :account, dependent: :destroy
+ has_many :statuses, inverse_of: :account, dependent: :destroy
+ has_many :favourites, inverse_of: :account, dependent: :destroy
+ has_many :mentions, inverse_of: :account, dependent: :destroy
+ has_many :notifications, inverse_of: :account, dependent: :destroy
+ end
+
def up
local_domain = Rails.configuration.x.local_domain
diff --git a/db/migrate/20190715164535_add_instance_actor.rb b/db/migrate/20190715164535_add_instance_actor.rb
index a26d54949..8c0301d69 100644
--- a/db/migrate/20190715164535_add_instance_actor.rb
+++ b/db/migrate/20190715164535_add_instance_actor.rb
@@ -1,4 +1,9 @@
class AddInstanceActor < ActiveRecord::Migration[5.2]
+ class Account < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ validates :username, uniqueness: { scope: :domain, case_sensitive: false }
+ end
+
def up
Account.create!(id: -99, actor_type: 'Application', locked: true, username: Rails.configuration.x.local_domain)
end
diff --git a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
index eb03d7ca7..3a6527f65 100644
--- a/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
+++ b/db/migrate/20190726175042_add_case_insensitive_index_to_tags.rb
@@ -15,7 +15,13 @@ class AddCaseInsensitiveIndexToTags < ActiveRecord::Migration[5.2]
Tag.where(id: redundant_tag_ids).in_batches.delete_all
end
- safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower ON tags (lower(name))' }
+ begin
+ safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower ON tags (lower(name))' }
+ rescue ActiveRecord::StatementInvalid
+ remove_index :tags, name: 'index_tags_on_name_lower'
+ raise
+ end
+
remove_index :tags, name: 'index_tags_on_name'
remove_index :tags, name: 'hashtag_search_index'
end
diff --git a/db/migrate/20191007013357_update_pt_locales.rb b/db/migrate/20191007013357_update_pt_locales.rb
index b7288d38a..9e8f8b424 100644
--- a/db/migrate/20191007013357_update_pt_locales.rb
+++ b/db/migrate/20191007013357_update_pt_locales.rb
@@ -1,4 +1,8 @@
class UpdatePtLocales < ActiveRecord::Migration[5.2]
+ class User < ApplicationRecord
+ # Dummy class, to make migration possible across version changes
+ end
+
disable_ddl_transaction!
def up
diff --git a/db/migrate/20200508212852_reset_unique_jobs_locks.rb b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
index 304e49322..d717ffc54 100644
--- a/db/migrate/20200508212852_reset_unique_jobs_locks.rb
+++ b/db/migrate/20200508212852_reset_unique_jobs_locks.rb
@@ -3,7 +3,7 @@ class ResetUniqueJobsLocks < ActiveRecord::Migration[5.2]
def up
# We do this to clean up unique job digests that were not properly
- # disposed of prior to https://github.com/tootsuite/mastodon/pull/13361
+ # disposed of prior to https://github.com/mastodon/mastodon/pull/13361
until SidekiqUniqueJobs::Digests.new.delete_by_pattern('*').nil?; end
end
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
index c3aa8e33c..366bf9aa7 100644
--- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
+++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb
@@ -1,15 +1,9 @@
-class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
- disable_ddl_transaction!
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
- class CorruptionError < StandardError
- def cause
- nil
- end
+class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
+ include Mastodon::MigrationHelpers
- def backtrace
- []
- end
- end
+ disable_ddl_transaction!
def up
if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower') && index_name_exists?(:accounts, 'index_accounts_on_username_and_domain_lower')
@@ -21,7 +15,8 @@ class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2]
begin
add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently
rescue ActiveRecord::RecordNotUnique
- raise CorruptionError, 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing'
+ remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower'
+ raise CorruptionError
end
remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower' if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower')
diff --git a/db/migrate/20210416200740_create_canonical_email_blocks.rb b/db/migrate/20210416200740_create_canonical_email_blocks.rb
index a1f1660bf..32c44646c 100644
--- a/db/migrate/20210416200740_create_canonical_email_blocks.rb
+++ b/db/migrate/20210416200740_create_canonical_email_blocks.rb
@@ -2,7 +2,7 @@ class CreateCanonicalEmailBlocks < ActiveRecord::Migration[6.1]
def change
create_table :canonical_email_blocks do |t|
t.string :canonical_email_hash, null: false, default: '', index: { unique: true }
- t.belongs_to :reference_account, null: false, foreign_key: { on_cascade: :delete, to_table: 'accounts' }
+ t.belongs_to :reference_account, null: false, foreign_key: { to_table: 'accounts' }
t.timestamps
end
diff --git a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
index ed359e8cd..e492c9e86 100644
--- a/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
+++ b/db/migrate/20210421121431_add_case_insensitive_btree_index_to_tags.rb
@@ -1,8 +1,19 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
class AddCaseInsensitiveBtreeIndexToTags < ActiveRecord::Migration[5.2]
+ include Mastodon::MigrationHelpers
+
disable_ddl_transaction!
def up
- safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)' }
+ begin
+ safety_assured { execute 'CREATE UNIQUE INDEX CONCURRENTLY index_tags_on_name_lower_btree ON tags (lower(name) text_pattern_ops)' }
+ rescue ActiveRecord::StatementInvalid => e
+ remove_index :tags, name: 'index_tags_on_name_lower_btree'
+ raise CorruptionError if e.is_a?(ActiveRecord::RecordNotUnique)
+ raise e
+ end
+
remove_index :tags, name: 'index_tags_on_name_lower'
end
diff --git a/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
new file mode 100644
index 000000000..64cf84448
--- /dev/null
+++ b/db/migrate/20210630000137_fix_canonical_email_blocks_foreign_key.rb
@@ -0,0 +1,13 @@
+class FixCanonicalEmailBlocksForeignKey < ActiveRecord::Migration[6.1]
+ def up
+ safety_assured do
+ execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id) ON DELETE CASCADE;'
+ end
+ end
+
+ def down
+ safety_assured do
+ execute 'ALTER TABLE canonical_email_blocks DROP CONSTRAINT fk_rails_1ecb262096, ADD CONSTRAINT fk_rails_1ecb262096 FOREIGN KEY (reference_account_id) REFERENCES accounts(id);'
+ end
+ end
+end
diff --git a/db/post_migrate/20210526193025_remove_lock_version_from_account_stats.rb b/db/post_migrate/20210526193025_remove_lock_version_from_account_stats.rb
new file mode 100644
index 000000000..3079bed09
--- /dev/null
+++ b/db/post_migrate/20210526193025_remove_lock_version_from_account_stats.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveLockVersionFromAccountStats < ActiveRecord::Migration[5.2]
+ def change
+ safety_assured do
+ remove_column :account_stats, :lock_version, :integer, null: false, default: 0
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cdf1aa6e0..df30650ea 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2021_05_07_001928) do
+ActiveRecord::Schema.define(version: 2021_06_30_000137) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -111,7 +111,6 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "last_status_at"
- t.integer "lock_version", default: 0, null: false
t.index ["account_id"], name: "index_account_stats_on_account_id", unique: true
end
@@ -989,7 +988,7 @@ ActiveRecord::Schema.define(version: 2021_05_07_001928) do
add_foreign_key "blocks", "accounts", name: "fk_4269e03e65", on_delete: :cascade
add_foreign_key "bookmarks", "accounts", on_delete: :cascade
add_foreign_key "bookmarks", "statuses", on_delete: :cascade
- add_foreign_key "canonical_email_blocks", "accounts", column: "reference_account_id"
+ add_foreign_key "canonical_email_blocks", "accounts", column: "reference_account_id", on_delete: :cascade
add_foreign_key "conversation_mutes", "accounts", name: "fk_225b4212bb", on_delete: :cascade
add_foreign_key "conversation_mutes", "conversations", on_delete: :cascade
add_foreign_key "custom_filters", "accounts", on_delete: :cascade
diff --git a/db/views/follow_recommendations_v01.sql b/db/views/follow_recommendations_v01.sql
index 799abeaee..8295bbc0f 100644
--- a/db/views/follow_recommendations_v01.sql
+++ b/db/views/follow_recommendations_v01.sql
@@ -20,7 +20,7 @@ FROM (
HAVING count(follows.id) >= 5
UNION ALL
SELECT accounts.id AS account_id,
- sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+ sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
'most_interactions' AS reason
FROM status_stats
INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -32,7 +32,7 @@ FROM (
AND accounts.locked = 'f'
AND accounts.discoverable = 't'
GROUP BY accounts.id
- HAVING sum(reblogs_count + favourites_count) >= 5
+ HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
) t0
GROUP BY account_id
ORDER BY rank DESC
diff --git a/db/views/follow_recommendations_v02.sql b/db/views/follow_recommendations_v02.sql
index 673c5cc85..f67c6eecf 100644
--- a/db/views/follow_recommendations_v02.sql
+++ b/db/views/follow_recommendations_v02.sql
@@ -18,7 +18,7 @@ FROM (
HAVING count(follows.id) >= 5
UNION ALL
SELECT account_summaries.account_id AS account_id,
- sum(reblogs_count + favourites_count) / (1.0 + sum(reblogs_count + favourites_count)) AS rank,
+ sum(status_stats.reblogs_count + status_stats.favourites_count) / (1.0 + sum(status_stats.reblogs_count + status_stats.favourites_count)) AS rank,
'most_interactions' AS reason
FROM status_stats
INNER JOIN statuses ON statuses.id = status_stats.status_id
@@ -28,7 +28,7 @@ FROM (
AND account_summaries.sensitive = 'f'
AND follow_recommendation_suppressions.id IS NULL
GROUP BY account_summaries.account_id
- HAVING sum(reblogs_count + favourites_count) >= 5
+ HAVING sum(status_stats.reblogs_count + status_stats.favourites_count) >= 5
) t0
GROUP BY account_id
ORDER BY rank DESC
diff --git a/docker-compose.yml b/docker-compose.yml
index 52eea7a74..97b6f1655 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
web:
build: .
- image: tootsuite/mastodon
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -63,7 +63,7 @@ services:
streaming:
build: .
- image: tootsuite/mastodon
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: node ./streaming
@@ -80,7 +80,7 @@ services:
sidekiq:
build: .
- image: tootsuite/mastodon
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/cli.rb b/lib/cli.rb
index 3f1658566..8815e137a 100644
--- a/lib/cli.rb
+++ b/lib/cli.rb
@@ -94,17 +94,22 @@ module Mastodon
exit(1) unless prompt.ask('Type in the domain of the server to confirm:', required: true) == Rails.configuration.x.local_domain
- prompt.warn('This operation WILL NOT be reversible. It can also take a long time.')
- prompt.warn('While the data won\'t be erased locally, the server will be in a BROKEN STATE afterwards.')
- prompt.warn('A running Sidekiq process is required. Do not shut it down until queues clear.')
+ unless options[:dry_run]
+ prompt.warn('This operation WILL NOT be reversible. It can also take a long time.')
+ prompt.warn('While the data won\'t be erased locally, the server will be in a BROKEN STATE afterwards.')
+ prompt.warn('A running Sidekiq process is required. Do not shut it down until queues clear.')
- exit(1) if prompt.no?('Are you sure you want to proceed?')
+ exit(1) if prompt.no?('Are you sure you want to proceed?')
+ end
inboxes = Account.inboxes
processed = 0
dry_run = options[:dry_run] ? ' (DRY RUN)' : ''
+ Setting.registrations_mode = 'none' unless options[:dry_run]
+
if inboxes.empty?
+ Account.local.without_suspended.in_batches.update_all(suspended_at: Time.now.utc, suspension_origin: :local) unless options[:dry_run]
prompt.ok('It seems like your server has not federated with anything')
prompt.ok('You can shut it down and delete it any time')
return
@@ -112,9 +117,7 @@ module Mastodon
prompt.warn('Do NOT interrupt this process...')
- Setting.registrations_mode = 'none'
-
- Account.local.without_suspended.find_each do |account|
+ delete_account = ->(account) do
payload = ActiveModelSerializers::SerializableResource.new(
account,
serializer: ActivityPub::DeleteActorSerializer,
@@ -128,12 +131,15 @@ module Mastodon
[json, account.id, inbox_url]
end
- account.suspend!
+ account.suspend!(block_email: false)
end
processed += 1
end
+ Account.local.without_suspended.find_each { |account| delete_account.call(account) }
+ Account.local.suspended.joins(:deletion_request).find_each { |account| delete_account.call(account) }
+
prompt.ok("Queued #{inboxes.size * processed} items into Sidekiq for #{processed} accounts#{dry_run}")
prompt.ok('Wait until Sidekiq processes all items, then you can shut everything down and delete the data')
rescue TTY::Reader::InputInterrupt
diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb
index 8e2084e33..47e2d78bb 100644
--- a/lib/mastodon/maintenance_cli.rb
+++ b/lib/mastodon/maintenance_cli.rb
@@ -14,7 +14,7 @@ module Mastodon
end
MIN_SUPPORTED_VERSION = 2019_10_01_213028
- MAX_SUPPORTED_VERSION = 2021_05_07_001928
+ MAX_SUPPORTED_VERSION = 2021_05_26_193025
# Stubs to enjoy ActiveRecord queries while not depending on a particular
# version of the code/database
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 59c118500..36ca71844 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -230,6 +230,7 @@ module Mastodon
processed, aggregate = parallelize_with_progress(scope) do |media_attachment|
next if media_attachment.remote_url.blank? || (!options[:force] && media_attachment.file_file_name.present?)
+ next if DomainBlock.reject_media?(media_attachment.account.domain)
unless options[:dry_run]
media_attachment.reset_file!
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 521d903bf..5bc903349 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -41,6 +41,20 @@
module Mastodon
module MigrationHelpers
+ class CorruptionError < StandardError
+ def initialize(message = nil)
+ super(message.presence || 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing')
+ end
+
+ def cause
+ nil
+ end
+
+ def backtrace
+ []
+ end
+ end
+
# Model that can be used for querying permissions of a SQL user.
class Grant < ActiveRecord::Base
self.table_name = 'information_schema.role_table_grants'
@@ -281,7 +295,7 @@ module Mastodon
table = Arel::Table.new(table_name)
total = estimate_rows_in_table(table_name).to_i
- if total == 0
+ if total < 1
count_arel = table.project(Arel.star.count.as('count'))
count_arel = yield table, count_arel if block_given?
diff --git a/lib/mastodon/search_cli.rb b/lib/mastodon/search_cli.rb
index c0491744b..0126dfcff 100644
--- a/lib/mastodon/search_cli.rb
+++ b/lib/mastodon/search_cli.rb
@@ -102,7 +102,7 @@ module Mastodon
ActiveRecord::Base.connection_pool.with_connection do
grouped_records = type.adapter.send(:grouped_objects, records)
- bulk_body = Chewy::Type::Import::BulkBuilder.new(type, grouped_records).bulk_body
+ bulk_body = Chewy::Type::Import::BulkBuilder.new(type, **grouped_records).bulk_body
end
index_count = grouped_records[:index].size if grouped_records.key?(:index)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 853c22e70..1d55c29ea 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 0
+ 6
end
def flags
@@ -33,7 +33,7 @@ module Mastodon
end
def repository
- ENV.fetch('GITHUB_REPOSITORY', 'tootsuite/mastodon')
+ ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon')
end
def source_base_url
diff --git a/lib/paperclip/response_with_limit_adapter.rb b/lib/paperclip/response_with_limit_adapter.rb
index 17a2abd25..deb89717a 100644
--- a/lib/paperclip/response_with_limit_adapter.rb
+++ b/lib/paperclip/response_with_limit_adapter.rb
@@ -17,9 +17,9 @@ module Paperclip
def cache_current_values
@original_filename = filename_from_content_disposition.presence || filename_from_path.presence || 'data'
- @size = @target.response.content_length
@tempfile = copy_to_tempfile(@target)
@content_type = ContentTypeDetector.new(@tempfile.path).detect
+ @size = File.size(@tempfile)
end
def copy_to_tempfile(source)
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 72bacb5eb..a89af6778 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -333,8 +333,12 @@ namespace :mastodon do
prompt.say 'This configuration will be written to .env.production'
if prompt.yes?('Save configuration?')
+ incompatible_syntax = false
+
env_contents = env.each_pair.map do |key, value|
if value.is_a?(String) && value =~ /[\s\#\\"]/
+ incompatible_syntax = true
+
if value =~ /[']/
value = value.to_s.gsub(/[\\"\$]/) { |x| "\\#{x}" }
"#{key}=\"#{value}\""
@@ -346,12 +350,19 @@ namespace :mastodon do
end
end.join("\n")
- File.write(Rails.root.join('.env.production'), "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + env_contents + "\n")
+ generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup
+
+ if incompatible_syntax
+ generated_header << "# Some variables in this file will be interpreted differently whether you are\n"
+ generated_header << "# using docker-compose or not.\n\n"
+ end
+
+ File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n")
if using_docker
prompt.ok 'Below is your configuration, save it to an .env.production file outside Docker:'
prompt.say "\n"
- prompt.say File.read(Rails.root.join('.env.production'))
+ prompt.say "#{generated_header}#{env.each_pair.map { |key, value| "#{key}=#{value}" }.join("\n")}"
prompt.say "\n"
prompt.ok 'It is also saved within this container so you can proceed with this wizard.'
end
@@ -430,7 +441,7 @@ namespace :mastodon do
namespace :webpush do
desc 'Generate VAPID key'
- task generate_vapid_key: :environment do
+ task :generate_vapid_key do
vapid_key = Webpush.generate_key
puts "VAPID_PRIVATE_KEY=#{vapid_key.private_key}"
puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}"
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 86c358a94..d004c5751 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-REPOSITORY_NAME = 'tootsuite/mastodon'
+REPOSITORY_NAME = 'mastodon/mastodon'
namespace :repo do
desc 'Generate the AUTHORS.md file'
@@ -34,7 +34,7 @@ namespace :repo do
file << <<~FOOTER
- This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+ This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/mastodon/mastodon/graphs/contributors) instead.
FOOTER
end
diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake
new file mode 100644
index 000000000..0f38b50e3
--- /dev/null
+++ b/lib/tasks/tests.rake
@@ -0,0 +1,181 @@
+# frozen_string_literal: true
+
+namespace :tests do
+ namespace :migrations do
+ desc 'Populate the database with test data for 2.0.0'
+ task populate_v2: :environment do
+ admin_key = OpenSSL::PKey::RSA.new(2048)
+ user_key = OpenSSL::PKey::RSA.new(2048)
+ remote_key = OpenSSL::PKey::RSA.new(2048)
+ remote_key2 = OpenSSL::PKey::RSA.new(2048)
+ remote_key3 = OpenSSL::PKey::RSA.new(2048)
+ admin_private_key = ActiveRecord::Base.connection.quote(admin_key.to_pem)
+ admin_public_key = ActiveRecord::Base.connection.quote(admin_key.public_key.to_pem)
+ user_private_key = ActiveRecord::Base.connection.quote(user_key.to_pem)
+ user_public_key = ActiveRecord::Base.connection.quote(user_key.public_key.to_pem)
+ remote_public_key = ActiveRecord::Base.connection.quote(remote_key.public_key.to_pem)
+ remote_public_key2 = ActiveRecord::Base.connection.quote(remote_key2.public_key.to_pem)
+ remote_public_key_ap = ActiveRecord::Base.connection.quote(remote_key3.public_key.to_pem)
+ local_domain = ActiveRecord::Base.connection.quote(Rails.configuration.x.local_domain)
+
+ ActiveRecord::Base.connection.execute(<<~SQL)
+ -- accounts
+
+ INSERT INTO "accounts"
+ (id, username, domain, private_key, public_key, created_at, updated_at)
+ VALUES
+ (1, 'admin', NULL, #{admin_private_key}, #{admin_public_key}, now(), now()),
+ (2, 'user', NULL, #{user_private_key}, #{user_public_key}, now(), now());
+
+ INSERT INTO "accounts"
+ (id, username, domain, private_key, public_key, created_at, updated_at, remote_url, salmon_url)
+ VALUES
+ (3, 'remote', 'remote.com', NULL, #{remote_public_key}, now(), now(),
+ 'https://remote.com/@remote', 'https://remote.com/salmon/1'),
+ (4, 'Remote', 'remote.com', NULL, #{remote_public_key}, now(), now(),
+ 'https://remote.com/@Remote', 'https://remote.com/salmon/1'),
+ (5, 'REMOTE', 'Remote.com', NULL, #{remote_public_key2}, now(), now(),
+ 'https://remote.com/stale/@REMOTE', 'https://remote.com/stale/salmon/1');
+
+ INSERT INTO "accounts"
+ (id, username, domain, private_key, public_key, created_at, updated_at, protocol, inbox_url, outbox_url, followers_url)
+ VALUES
+ (6, 'bob', 'activitypub.com', NULL, #{remote_public_key_ap}, now(), now(),
+ 1, 'https://activitypub.com/users/bob/inbox', 'https://activitypub.com/users/bob/outbox', 'https://activitypub.com/users/bob/followers');
+
+ INSERT INTO "accounts"
+ (id, username, domain, private_key, public_key, created_at, updated_at)
+ VALUES
+ (7, 'user', #{local_domain}, #{user_private_key}, #{user_public_key}, now(), now()),
+ (8, 'pt_user', NULL, #{user_private_key}, #{user_public_key}, now(), now());
+
+ -- users
+
+ INSERT INTO "users"
+ (id, account_id, email, created_at, updated_at, admin)
+ VALUES
+ (1, 1, 'admin@localhost', now(), now(), true),
+ (2, 2, 'user@localhost', now(), now(), false);
+
+ INSERT INTO "users"
+ (id, account_id, email, created_at, updated_at, admin, locale)
+ VALUES
+ (3, 7, 'ptuser@localhost', now(), now(), false, 'pt');
+
+ -- statuses
+
+ INSERT INTO "statuses"
+ (id, account_id, text, created_at, updated_at)
+ VALUES
+ (1, 1, 'test', now(), now()),
+ (2, 1, '@remote@remote.com hello', now(), now()),
+ (3, 1, '@Remote@remote.com hello', now(), now()),
+ (4, 1, '@REMOTE@remote.com hello', now(), now());
+
+ INSERT INTO "statuses"
+ (id, account_id, text, created_at, updated_at, uri, local)
+ VALUES
+ (5, 1, 'activitypub status', now(), now(), 'https://localhost/users/admin/statuses/4', true);
+
+ INSERT INTO "statuses"
+ (id, account_id, text, created_at, updated_at)
+ VALUES
+ (6, 3, 'test', now(), now());
+
+ INSERT INTO "statuses"
+ (id, account_id, text, created_at, updated_at, in_reply_to_id, in_reply_to_account_id)
+ VALUES
+ (7, 4, '@admin hello', now(), now(), 3, 1);
+
+ INSERT INTO "statuses"
+ (id, account_id, text, created_at, updated_at)
+ VALUES
+ (8, 5, 'test', now(), now());
+
+ INSERT INTO "statuses"
+ (id, account_id, reblog_of_id, created_at, updated_at)
+ VALUES
+ (9, 1, 2, now(), now());
+
+ -- mentions (from previous statuses)
+
+ INSERT INTO "mentions"
+ (status_id, account_id, created_at, updated_at)
+ VALUES
+ (2, 3, now(), now()),
+ (3, 4, now(), now()),
+ (4, 5, now(), now());
+
+ -- stream entries
+
+ INSERT INTO "stream_entries"
+ (activity_id, account_id, activity_type, created_at, updated_at)
+ VALUES
+ (1, 1, 'status', now(), now()),
+ (2, 1, 'status', now(), now()),
+ (3, 1, 'status', now(), now()),
+ (4, 1, 'status', now(), now()),
+ (5, 1, 'status', now(), now()),
+ (6, 3, 'status', now(), now()),
+ (7, 4, 'status', now(), now()),
+ (8, 5, 'status', now(), now()),
+ (9, 1, 'status', now(), now());
+
+
+ -- custom emoji
+
+ INSERT INTO "custom_emojis"
+ (shortcode, created_at, updated_at)
+ VALUES
+ ('test', now(), now()),
+ ('Test', now(), now()),
+ ('blobcat', now(), now());
+
+ INSERT INTO "custom_emojis"
+ (shortcode, domain, uri, created_at, updated_at)
+ VALUES
+ ('blobcat', 'remote.org', 'https://remote.org/emoji/blobcat', now(), now()),
+ ('blobcat', 'Remote.org', 'https://remote.org/emoji/blobcat', now(), now()),
+ ('Blobcat', 'remote.org', 'https://remote.org/emoji/Blobcat', now(), now());
+
+ -- favourites
+
+ INSERT INTO "favourites"
+ (account_id, status_id, created_at, updated_at)
+ VALUES
+ (1, 1, now(), now()),
+ (1, 7, now(), now()),
+ (4, 1, now(), now()),
+ (3, 1, now(), now()),
+ (5, 1, now(), now());
+
+ -- pinned statuses
+
+ INSERT INTO "status_pins"
+ (account_id, status_id, created_at, updated_at)
+ VALUES
+ (1, 1, now(), now()),
+ (3, 6, now(), now()),
+ (4, 7, now(), now());
+
+ -- follows
+
+ INSERT INTO "follows"
+ (account_id, target_account_id, created_at, updated_at)
+ VALUES
+ (1, 5, now(), now()),
+ (6, 2, now(), now()),
+ (5, 2, now(), now()),
+ (6, 1, now(), now());
+
+ -- follow requests
+
+ INSERT INTO "follow_requests"
+ (account_id, target_account_id, created_at, updated_at)
+ VALUES
+ (2, 5, now(), now()),
+ (5, 1, now(), now());
+ SQL
+ end
+ end
+end
diff --git a/package.json b/package.json
index 5bc1f6bf3..bedbf24aa 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "@tootsuite/mastodon",
+ "name": "@mastodon/mastodon",
"license": "AGPL-3.0-or-later",
"engines": {
"node": ">=12"
@@ -18,7 +18,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/tootsuite/mastodon.git"
+ "url": "https://github.com/mastodon/mastodon.git"
},
"browserslist": [
"last 2 versions",
@@ -59,11 +59,11 @@
},
"private": true,
"dependencies": {
- "@babel/core": "^7.14.0",
- "@babel/plugin-proposal-decorators": "^7.13.15",
+ "@babel/core": "^7.14.3",
+ "@babel/plugin-proposal-decorators": "^7.14.2",
"@babel/plugin-transform-react-inline-elements": "^7.12.13",
- "@babel/plugin-transform-runtime": "^7.13.15",
- "@babel/preset-env": "^7.14.1",
+ "@babel/plugin-transform-runtime": "^7.14.3",
+ "@babel/preset-env": "^7.14.4",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@gamestdio/websocket": "^0.3.2",
@@ -84,11 +84,11 @@
"color-blend": "^3.0.1",
"compression-webpack-plugin": "^6.1.1",
"cross-env": "^7.0.3",
- "css-loader": "^5.2.4",
+ "css-loader": "^5.2.6",
"cssnano": "^4.1.11",
"detect-passive-events": "^2.0.3",
- "dotenv": "^9.0.1",
- "emoji-mart": "Gargron/emoji-mart#build",
+ "dotenv": "^9.0.2",
+ "emoji-mart": "^3.0.1",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
@@ -137,9 +137,9 @@
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
- "react-select": "^4.3.0",
+ "react-select": "^4.3.1",
"react-sparklines": "^1.7.0",
- "react-swipeable-views": "^0.13.9",
+ "react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.2",
"react-toggle": "^4.1.2",
"redis": "^3.1.2",
@@ -151,8 +151,8 @@
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^3.0.2",
- "sass": "^1.32.12",
- "sass-loader": "^10.1.1",
+ "sass": "^1.34.0",
+ "sass-loader": "^10.2.0",
"stacktrace-js": "^2.0.2",
"stringz": "^2.1.0",
"substring-trie": "^1.0.2",
@@ -164,22 +164,22 @@
"uuid": "^8.3.1",
"webpack": "^4.46.0",
"webpack-assets-manifest": "^4.0.6",
- "webpack-bundle-analyzer": "^4.4.1",
+ "webpack-bundle-analyzer": "^4.4.2",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
- "ws": "^7.4.5"
+ "ws": "^7.4.6"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.12.0",
- "@testing-library/react": "^11.2.6",
+ "@testing-library/react": "^11.2.7",
"babel-eslint": "^10.1.0",
- "babel-jest": "^26.6.3",
- "eslint": "^7.26.0",
- "eslint-plugin-import": "~2.22.1",
+ "babel-jest": "^27.0.2",
+ "eslint": "^7.27.0",
+ "eslint-plugin-import": "~2.23.4",
"eslint-plugin-jsx-a11y": "~6.4.1",
"eslint-plugin-promise": "~5.1.0",
- "eslint-plugin-react": "~7.23.2",
+ "eslint-plugin-react": "~7.24.0",
"jest": "^26.6.3",
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
diff --git a/public/emoji/1f1f5-1f1f9.svg b/public/emoji/1f1f5-1f1f9.svg
index 78b29a89f..c1d4a84ff 100644
--- a/public/emoji/1f1f5-1f1f9.svg
+++ b/public/emoji/1f1f5-1f1f9.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f1f9-1f1ed.svg b/public/emoji/1f1f9-1f1ed.svg
index ff2a66f93..0bd4165c0 100644
--- a/public/emoji/1f1f9-1f1ed.svg
+++ b/public/emoji/1f1f9-1f1ed.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f36a.svg b/public/emoji/1f36a.svg
index d1b604bcd..4f5368a41 100644
--- a/public/emoji/1f36a.svg
+++ b/public/emoji/1f36a.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f3a2.svg b/public/emoji/1f3a2.svg
index b1e64ec0e..256d8afb7 100644
--- a/public/emoji/1f3a2.svg
+++ b/public/emoji/1f3a2.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f3af.svg b/public/emoji/1f3af.svg
index 9562c6c39..073817f2f 100644
--- a/public/emoji/1f3af.svg
+++ b/public/emoji/1f3af.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f3f3-fe0f-200d-26a7-fe0f.svg b/public/emoji/1f3f3-fe0f-200d-26a7-fe0f.svg
index f9fc064c0..a789852e9 100644
--- a/public/emoji/1f3f3-fe0f-200d-26a7-fe0f.svg
+++ b/public/emoji/1f3f3-fe0f-200d-26a7-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f408-200d-2b1b.svg b/public/emoji/1f408-200d-2b1b.svg
new file mode 100644
index 000000000..cf7b1d902
--- /dev/null
+++ b/public/emoji/1f408-200d-2b1b.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f429.svg b/public/emoji/1f429.svg
index 4852dda3d..0ffd08288 100644
--- a/public/emoji/1f429.svg
+++ b/public/emoji/1f429.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f43b-200d-2744-fe0f.svg b/public/emoji/1f43b-200d-2744-fe0f.svg
new file mode 100644
index 000000000..dc70f185a
--- /dev/null
+++ b/public/emoji/1f43b-200d-2744-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f441.svg b/public/emoji/1f441.svg
index 75e9c48a4..bd1a45e4e 100644
--- a/public/emoji/1f441.svg
+++ b/public/emoji/1f441.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-1f37c.svg b/public/emoji/1f468-1f3fb-200d-1f37c.svg
new file mode 100644
index 000000000..19c8fff2e
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-1f384.svg b/public/emoji/1f468-1f3fb-200d-1f384.svg
new file mode 100644
index 000000000..ef5c61531
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..d5fafaa3b
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..ba0096370
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..9a9e5aa1b
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..84271cae4
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..2c1977955
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..0a1584651
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..3c29712ca
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..6aca82f50
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..c8d0b8bd8
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..73928de4a
--- /dev/null
+++ b/public/emoji/1f468-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-1f37c.svg b/public/emoji/1f468-1f3fc-200d-1f37c.svg
new file mode 100644
index 000000000..5d702994d
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-1f384.svg b/public/emoji/1f468-1f3fc-200d-1f384.svg
new file mode 100644
index 000000000..5adcdf4eb
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..078e78a91
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..aa7784294
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..15e6ad3ac
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..e0cceb672
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..882bfbffb
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..1042a95e8
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..84edcd44b
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..dd31c8a5f
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..56780ef10
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..660d27bf2
--- /dev/null
+++ b/public/emoji/1f468-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-1f37c.svg b/public/emoji/1f468-1f3fd-200d-1f37c.svg
new file mode 100644
index 000000000..46f2ea1a0
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-1f384.svg b/public/emoji/1f468-1f3fd-200d-1f384.svg
new file mode 100644
index 000000000..0a56a8b1c
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..6350ae774
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..7ca4a90ef
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..4b4e1c938
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..f48b7bad1
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..c11dec5fd
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..7e9c5db08
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..4c8801583
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..dd9aa5c10
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..f597a9d34
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..6c9eab66f
--- /dev/null
+++ b/public/emoji/1f468-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-1f37c.svg b/public/emoji/1f468-1f3fe-200d-1f37c.svg
new file mode 100644
index 000000000..ea5681fe9
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-1f384.svg b/public/emoji/1f468-1f3fe-200d-1f384.svg
new file mode 100644
index 000000000..16b3b33ec
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..c5731cc6c
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..491f78791
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..c05f4abf2
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..b770611d9
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..b6985d6d7
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..996f8590c
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..36577f2f8
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..4dd4d4fc0
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..2341ee2fd
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..8285d8e98
--- /dev/null
+++ b/public/emoji/1f468-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-1f37c.svg b/public/emoji/1f468-1f3ff-200d-1f37c.svg
new file mode 100644
index 000000000..330c92ef7
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-1f384.svg b/public/emoji/1f468-1f3ff-200d-1f384.svg
new file mode 100644
index 000000000..4923cbf40
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..a535d6a31
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..3f9d8cfde
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..888ae0c70
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..d1f3b8c20
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..b027d467d
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..c1901ecd1
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..0fb35cc35
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..ecad79993
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..a94946a94
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..fda248288
--- /dev/null
+++ b/public/emoji/1f468-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-200d-1f37c.svg b/public/emoji/1f468-200d-1f37c.svg
new file mode 100644
index 000000000..971908e44
--- /dev/null
+++ b/public/emoji/1f468-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-200d-1f384.svg b/public/emoji/1f468-200d-1f384.svg
new file mode 100644
index 000000000..9c61da6c0
--- /dev/null
+++ b/public/emoji/1f468-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg b/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg
index cace24fc3..27d1b6fc7 100644
--- a/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg
+++ b/public/emoji/1f468-200d-2764-fe0f-200d-1f468.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f468-200d-2764-fe0f-200d-1f48b-200d-1f468.svg b/public/emoji/1f468-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
index 41dbd9681..831f2fb2e 100644
--- a/public/emoji/1f468-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
+++ b/public/emoji/1f468-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-1f37c.svg b/public/emoji/1f469-1f3fb-200d-1f37c.svg
new file mode 100644
index 000000000..311bda9fa
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-1f384.svg b/public/emoji/1f469-1f3fb-200d-1f384.svg
new file mode 100644
index 000000000..0227456d0
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..15a822ace
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..7162de94b
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..4bd37fce1
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..3db3581d0
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..994658d22
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..73314e4ab
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..9c6f709ad
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..9bd747f46
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..2aa5a27af
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..e9f571ef4
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..d0b112fe3
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..5d6019e80
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..3580f3a3d
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..e19d11045
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..4bfa08b5d
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..821a996ae
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..e26fe32b9
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..abb321d9b
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..bab53ae51
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..0659c9b7f
--- /dev/null
+++ b/public/emoji/1f469-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-1f37c.svg b/public/emoji/1f469-1f3fc-200d-1f37c.svg
new file mode 100644
index 000000000..cfae280ec
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-1f384.svg b/public/emoji/1f469-1f3fc-200d-1f384.svg
new file mode 100644
index 000000000..5887d75e0
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..5ffb98f01
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..079a8e4c8
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..460e58ae5
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..42a17a816
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..6fa892b19
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..fb36178d2
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..922e2a933
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..4dac2cb8d
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..cc441541b
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..f40bebabe
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..096f2e583
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..ec70a000a
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..f8b70f527
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..7724820b0
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..2464e01e4
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..2ee4ff885
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..286e47cdb
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..364288780
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..64c21a1de
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..02d27ddfd
--- /dev/null
+++ b/public/emoji/1f469-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-1f37c.svg b/public/emoji/1f469-1f3fd-200d-1f37c.svg
new file mode 100644
index 000000000..8e1e408c5
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-1f384.svg b/public/emoji/1f469-1f3fd-200d-1f384.svg
new file mode 100644
index 000000000..3e1853d2b
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..695e539bb
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..65a77e2bd
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..d1d91a30c
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..50d60b779
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..5fd131c45
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..1356db026
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..7438c5b0b
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..38e0b432f
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..b48f1d46f
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..321d1f64a
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..cb04f1019
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..4325ef397
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..6f77cbd32
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..524d10235
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..3cb1b4974
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..04715e3df
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..d0d6dab84
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..2894b6114
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..4faa37f2d
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..1813ca49b
--- /dev/null
+++ b/public/emoji/1f469-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-1f37c.svg b/public/emoji/1f469-1f3fe-200d-1f37c.svg
new file mode 100644
index 000000000..b910a8776
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-1f384.svg b/public/emoji/1f469-1f3fe-200d-1f384.svg
new file mode 100644
index 000000000..6d94d270d
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..a600e7b2f
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..eb47006f6
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..a34e5cefc
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..824bbc488
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..91f217cc7
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..c12c9583c
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..1a55bb200
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..441d235b9
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..17525760e
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..53aefb1d9
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..d65532a72
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..59e515fe7
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..0db014b26
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..cb9ec9c43
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..29b48c05b
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..fa0aed880
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..e12111f65
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..4e264e194
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..d40884564
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..16d2f9292
--- /dev/null
+++ b/public/emoji/1f469-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-1f37c.svg b/public/emoji/1f469-1f3ff-200d-1f37c.svg
new file mode 100644
index 000000000..698556668
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-1f384.svg b/public/emoji/1f469-1f3ff-200d-1f384.svg
new file mode 100644
index 000000000..2178a33ca
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..63a94f31b
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..86a47dc08
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..8bc287f05
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..f456c7cf4
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..4ab740428
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..ab8a2c16c
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..0d784f5e1
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..226ba13dc
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..bd5f6c1d1
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..534795834
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
new file mode 100644
index 000000000..74c86e378
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
new file mode 100644
index 000000000..16731da4b
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
new file mode 100644
index 000000000..b18477a0e
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
new file mode 100644
index 000000000..1e8fee5fe
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
new file mode 100644
index 000000000..42aa5cad5
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f468-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
new file mode 100644
index 000000000..63c098a5e
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
new file mode 100644
index 000000000..295504b57
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
new file mode 100644
index 000000000..9150da85b
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
new file mode 100644
index 000000000..f5d3fe5b2
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
new file mode 100644
index 000000000..77da15016
--- /dev/null
+++ b/public/emoji/1f469-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f469-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-200d-1f37c.svg b/public/emoji/1f469-200d-1f37c.svg
new file mode 100644
index 000000000..c13cc5371
--- /dev/null
+++ b/public/emoji/1f469-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-200d-1f384.svg b/public/emoji/1f469-200d-1f384.svg
new file mode 100644
index 000000000..6cabe5829
--- /dev/null
+++ b/public/emoji/1f469-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg b/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
index 8248ed607..210f97c99 100644
--- a/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
+++ b/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.svg b/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.svg
index e46dfcaeb..e8eee47b9 100644
--- a/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.svg
+++ b/public/emoji/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f470-1f3fb-200d-2640-fe0f.svg
new file mode 100644
index 000000000..6e0b0fe34
--- /dev/null
+++ b/public/emoji/1f470-1f3fb-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f470-1f3fb-200d-2642-fe0f.svg
new file mode 100644
index 000000000..84c773ab0
--- /dev/null
+++ b/public/emoji/1f470-1f3fb-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fb.svg b/public/emoji/1f470-1f3fb.svg
index 7691a70a3..e8c6cd06b 100644
--- a/public/emoji/1f470-1f3fb.svg
+++ b/public/emoji/1f470-1f3fb.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f470-1f3fc-200d-2640-fe0f.svg
new file mode 100644
index 000000000..ee4102b65
--- /dev/null
+++ b/public/emoji/1f470-1f3fc-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f470-1f3fc-200d-2642-fe0f.svg
new file mode 100644
index 000000000..f894e261c
--- /dev/null
+++ b/public/emoji/1f470-1f3fc-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fc.svg b/public/emoji/1f470-1f3fc.svg
index 2ce98ebb1..511c7aa82 100644
--- a/public/emoji/1f470-1f3fc.svg
+++ b/public/emoji/1f470-1f3fc.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f470-1f3fd-200d-2640-fe0f.svg
new file mode 100644
index 000000000..3d7605dc3
--- /dev/null
+++ b/public/emoji/1f470-1f3fd-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f470-1f3fd-200d-2642-fe0f.svg
new file mode 100644
index 000000000..f1b941d1c
--- /dev/null
+++ b/public/emoji/1f470-1f3fd-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fd.svg b/public/emoji/1f470-1f3fd.svg
index 3d4070c42..4fc12eb55 100644
--- a/public/emoji/1f470-1f3fd.svg
+++ b/public/emoji/1f470-1f3fd.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f470-1f3fe-200d-2640-fe0f.svg
new file mode 100644
index 000000000..1e33374c3
--- /dev/null
+++ b/public/emoji/1f470-1f3fe-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f470-1f3fe-200d-2642-fe0f.svg
new file mode 100644
index 000000000..1c8135c96
--- /dev/null
+++ b/public/emoji/1f470-1f3fe-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3fe.svg b/public/emoji/1f470-1f3fe.svg
index ac399c7fe..c30f3c093 100644
--- a/public/emoji/1f470-1f3fe.svg
+++ b/public/emoji/1f470-1f3fe.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f470-1f3ff-200d-2640-fe0f.svg
new file mode 100644
index 000000000..656a9b71c
--- /dev/null
+++ b/public/emoji/1f470-1f3ff-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f470-1f3ff-200d-2642-fe0f.svg
new file mode 100644
index 000000000..2c090f1a0
--- /dev/null
+++ b/public/emoji/1f470-1f3ff-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-1f3ff.svg b/public/emoji/1f470-1f3ff.svg
index dc1166ecb..9e0f2a25b 100644
--- a/public/emoji/1f470-1f3ff.svg
+++ b/public/emoji/1f470-1f3ff.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f470-200d-2640-fe0f.svg b/public/emoji/1f470-200d-2640-fe0f.svg
new file mode 100644
index 000000000..2fd75bfe8
--- /dev/null
+++ b/public/emoji/1f470-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470-200d-2642-fe0f.svg b/public/emoji/1f470-200d-2642-fe0f.svg
new file mode 100644
index 000000000..d12c670e5
--- /dev/null
+++ b/public/emoji/1f470-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f470.svg b/public/emoji/1f470.svg
index e68b5345b..a41b9b997 100644
--- a/public/emoji/1f470.svg
+++ b/public/emoji/1f470.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f489.svg b/public/emoji/1f489.svg
index ef9c72c74..6fb5e9e9d 100644
--- a/public/emoji/1f489.svg
+++ b/public/emoji/1f489.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f48f-1f3fb.svg b/public/emoji/1f48f-1f3fb.svg
new file mode 100644
index 000000000..787f82768
--- /dev/null
+++ b/public/emoji/1f48f-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f48f-1f3fc.svg b/public/emoji/1f48f-1f3fc.svg
new file mode 100644
index 000000000..dbfac3f01
--- /dev/null
+++ b/public/emoji/1f48f-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f48f-1f3fd.svg b/public/emoji/1f48f-1f3fd.svg
new file mode 100644
index 000000000..1fe89be5e
--- /dev/null
+++ b/public/emoji/1f48f-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f48f-1f3fe.svg b/public/emoji/1f48f-1f3fe.svg
new file mode 100644
index 000000000..394eafe0a
--- /dev/null
+++ b/public/emoji/1f48f-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f48f-1f3ff.svg b/public/emoji/1f48f-1f3ff.svg
new file mode 100644
index 000000000..7087f915f
--- /dev/null
+++ b/public/emoji/1f48f-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f48f.svg b/public/emoji/1f48f.svg
index 69cec3c60..ea67314f2 100644
--- a/public/emoji/1f48f.svg
+++ b/public/emoji/1f48f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f491-1f3fb.svg b/public/emoji/1f491-1f3fb.svg
new file mode 100644
index 000000000..b4795dd07
--- /dev/null
+++ b/public/emoji/1f491-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f491-1f3fc.svg b/public/emoji/1f491-1f3fc.svg
new file mode 100644
index 000000000..971e87460
--- /dev/null
+++ b/public/emoji/1f491-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f491-1f3fd.svg b/public/emoji/1f491-1f3fd.svg
new file mode 100644
index 000000000..3f042ca6a
--- /dev/null
+++ b/public/emoji/1f491-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f491-1f3fe.svg b/public/emoji/1f491-1f3fe.svg
new file mode 100644
index 000000000..8e98402f2
--- /dev/null
+++ b/public/emoji/1f491-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f491-1f3ff.svg b/public/emoji/1f491-1f3ff.svg
new file mode 100644
index 000000000..9257f7c0d
--- /dev/null
+++ b/public/emoji/1f491-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f491.svg b/public/emoji/1f491.svg
index ece280dc0..73a30e93e 100644
--- a/public/emoji/1f491.svg
+++ b/public/emoji/1f491.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa-1f3fb.svg b/public/emoji/1f4aa-1f3fb.svg
index 63f868316..2627eea6f 100644
--- a/public/emoji/1f4aa-1f3fb.svg
+++ b/public/emoji/1f4aa-1f3fb.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa-1f3fc.svg b/public/emoji/1f4aa-1f3fc.svg
index d9e082108..2cac971ba 100644
--- a/public/emoji/1f4aa-1f3fc.svg
+++ b/public/emoji/1f4aa-1f3fc.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa-1f3fd.svg b/public/emoji/1f4aa-1f3fd.svg
index 39820dbc7..68f6b7503 100644
--- a/public/emoji/1f4aa-1f3fd.svg
+++ b/public/emoji/1f4aa-1f3fd.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa-1f3fe.svg b/public/emoji/1f4aa-1f3fe.svg
index d93cc7b9f..c773c6728 100644
--- a/public/emoji/1f4aa-1f3fe.svg
+++ b/public/emoji/1f4aa-1f3fe.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa-1f3ff.svg b/public/emoji/1f4aa-1f3ff.svg
index d9b4481ed..16efbe0f4 100644
--- a/public/emoji/1f4aa-1f3ff.svg
+++ b/public/emoji/1f4aa-1f3ff.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4aa.svg b/public/emoji/1f4aa.svg
index 38a7bb525..7b4c1206c 100644
--- a/public/emoji/1f4aa.svg
+++ b/public/emoji/1f4aa.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4b4.svg b/public/emoji/1f4b4.svg
index 5db237d4e..747870e0e 100644
--- a/public/emoji/1f4b4.svg
+++ b/public/emoji/1f4b4.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4b5.svg b/public/emoji/1f4b5.svg
index 113c6d0bb..1c68944af 100644
--- a/public/emoji/1f4b5.svg
+++ b/public/emoji/1f4b5.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4b6.svg b/public/emoji/1f4b6.svg
index 1869987fe..afd8b7154 100644
--- a/public/emoji/1f4b6.svg
+++ b/public/emoji/1f4b6.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4b7.svg b/public/emoji/1f4b7.svg
index 93a16ff62..ff5c5a44b 100644
--- a/public/emoji/1f4b7.svg
+++ b/public/emoji/1f4b7.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4b8.svg b/public/emoji/1f4b8.svg
index d2d63ceb9..8b6fa1097 100644
--- a/public/emoji/1f4b8.svg
+++ b/public/emoji/1f4b8.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4ba.svg b/public/emoji/1f4ba.svg
index bf27bb184..ab311bc7b 100644
--- a/public/emoji/1f4ba.svg
+++ b/public/emoji/1f4ba.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4c5.svg b/public/emoji/1f4c5.svg
index ca68a82a6..476a9506c 100644
--- a/public/emoji/1f4c5.svg
+++ b/public/emoji/1f4c5.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f4c6.svg b/public/emoji/1f4c6.svg
index ff073d742..b2de8c5c2 100644
--- a/public/emoji/1f4c6.svg
+++ b/public/emoji/1f4c6.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f536.svg b/public/emoji/1f536.svg
index 116e72265..9695be3ee 100644
--- a/public/emoji/1f536.svg
+++ b/public/emoji/1f536.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f538.svg b/public/emoji/1f538.svg
index 435ad6a5d..842ffcc58 100644
--- a/public/emoji/1f538.svg
+++ b/public/emoji/1f538.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f5e1.svg b/public/emoji/1f5e1.svg
index 2741fb89d..d1d7712c0 100644
--- a/public/emoji/1f5e1.svg
+++ b/public/emoji/1f5e1.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f606.svg b/public/emoji/1f606.svg
index e82c405ae..fed5ff58a 100644
--- a/public/emoji/1f606.svg
+++ b/public/emoji/1f606.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f60b.svg b/public/emoji/1f60b.svg
index 2c962bb64..27e0d3a4c 100644
--- a/public/emoji/1f60b.svg
+++ b/public/emoji/1f60b.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f616.svg b/public/emoji/1f616.svg
index 2b8871cee..fb915d6d4 100644
--- a/public/emoji/1f616.svg
+++ b/public/emoji/1f616.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f61b.svg b/public/emoji/1f61b.svg
index 903422aef..e249672d2 100644
--- a/public/emoji/1f61b.svg
+++ b/public/emoji/1f61b.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f61c.svg b/public/emoji/1f61c.svg
index 6f7873904..76b205dc7 100644
--- a/public/emoji/1f61c.svg
+++ b/public/emoji/1f61c.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f61d.svg b/public/emoji/1f61d.svg
index 09dead62a..c49803816 100644
--- a/public/emoji/1f61d.svg
+++ b/public/emoji/1f61d.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f62e-200d-1f4a8.svg b/public/emoji/1f62e-200d-1f4a8.svg
new file mode 100644
index 000000000..d8a4b6e0c
--- /dev/null
+++ b/public/emoji/1f62e-200d-1f4a8.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f633.svg b/public/emoji/1f633.svg
index 2663c8cee..80ee1fefe 100644
--- a/public/emoji/1f633.svg
+++ b/public/emoji/1f633.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f635-200d-1f4ab.svg b/public/emoji/1f635-200d-1f4ab.svg
new file mode 100644
index 000000000..3238e0b0e
--- /dev/null
+++ b/public/emoji/1f635-200d-1f4ab.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f636-200d-1f32b-fe0f.svg b/public/emoji/1f636-200d-1f32b-fe0f.svg
new file mode 100644
index 000000000..dc0a4745f
--- /dev/null
+++ b/public/emoji/1f636-200d-1f32b-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f6d6.svg b/public/emoji/1f6d6.svg
new file mode 100644
index 000000000..b2866e07d
--- /dev/null
+++ b/public/emoji/1f6d6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f6d7.svg b/public/emoji/1f6d7.svg
new file mode 100644
index 000000000..5369e5793
--- /dev/null
+++ b/public/emoji/1f6d7.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f6fb.svg b/public/emoji/1f6fb.svg
new file mode 100644
index 000000000..87643ae93
--- /dev/null
+++ b/public/emoji/1f6fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f6fc.svg b/public/emoji/1f6fc.svg
new file mode 100644
index 000000000..091d51ef6
--- /dev/null
+++ b/public/emoji/1f6fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f7e0.svg b/public/emoji/1f7e0.svg
index 2db43d5b2..f5e120075 100644
--- a/public/emoji/1f7e0.svg
+++ b/public/emoji/1f7e0.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f7e7.svg b/public/emoji/1f7e7.svg
index 3cbdde4d9..1377a4eb9 100644
--- a/public/emoji/1f7e7.svg
+++ b/public/emoji/1f7e7.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f90c-1f3fb.svg b/public/emoji/1f90c-1f3fb.svg
new file mode 100644
index 000000000..8af452131
--- /dev/null
+++ b/public/emoji/1f90c-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f90c-1f3fc.svg b/public/emoji/1f90c-1f3fc.svg
new file mode 100644
index 000000000..7cee5bd5d
--- /dev/null
+++ b/public/emoji/1f90c-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f90c-1f3fd.svg b/public/emoji/1f90c-1f3fd.svg
new file mode 100644
index 000000000..2898fe391
--- /dev/null
+++ b/public/emoji/1f90c-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f90c-1f3fe.svg b/public/emoji/1f90c-1f3fe.svg
new file mode 100644
index 000000000..2e706ba42
--- /dev/null
+++ b/public/emoji/1f90c-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f90c-1f3ff.svg b/public/emoji/1f90c-1f3ff.svg
new file mode 100644
index 000000000..e17d4b094
--- /dev/null
+++ b/public/emoji/1f90c-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f90c.svg b/public/emoji/1f90c.svg
new file mode 100644
index 000000000..56b40f34c
--- /dev/null
+++ b/public/emoji/1f90c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f923.svg b/public/emoji/1f923.svg
index 7ddfcae30..d0e3c759a 100644
--- a/public/emoji/1f923.svg
+++ b/public/emoji/1f923.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f927.svg b/public/emoji/1f927.svg
index dc86ab356..06fee3f77 100644
--- a/public/emoji/1f927.svg
+++ b/public/emoji/1f927.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f92e.svg b/public/emoji/1f92e.svg
index d792679fd..42df3bd98 100644
--- a/public/emoji/1f92e.svg
+++ b/public/emoji/1f92e.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f92f.svg b/public/emoji/1f92f.svg
index 664d96059..3ac19ed41 100644
--- a/public/emoji/1f92f.svg
+++ b/public/emoji/1f92f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f933.svg b/public/emoji/1f933.svg
index 47fa031f6..88382e13b 100644
--- a/public/emoji/1f933.svg
+++ b/public/emoji/1f933.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f94d.svg b/public/emoji/1f94d.svg
index 2a4eb10c9..8c6bcb989 100644
--- a/public/emoji/1f94d.svg
+++ b/public/emoji/1f94d.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f972.svg b/public/emoji/1f972.svg
new file mode 100644
index 000000000..f309c2236
--- /dev/null
+++ b/public/emoji/1f972.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977-1f3fb.svg b/public/emoji/1f977-1f3fb.svg
new file mode 100644
index 000000000..5c981c21f
--- /dev/null
+++ b/public/emoji/1f977-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977-1f3fc.svg b/public/emoji/1f977-1f3fc.svg
new file mode 100644
index 000000000..6c3545e54
--- /dev/null
+++ b/public/emoji/1f977-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977-1f3fd.svg b/public/emoji/1f977-1f3fd.svg
new file mode 100644
index 000000000..557267b77
--- /dev/null
+++ b/public/emoji/1f977-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977-1f3fe.svg b/public/emoji/1f977-1f3fe.svg
new file mode 100644
index 000000000..8b65491bf
--- /dev/null
+++ b/public/emoji/1f977-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977-1f3ff.svg b/public/emoji/1f977-1f3ff.svg
new file mode 100644
index 000000000..7d3287279
--- /dev/null
+++ b/public/emoji/1f977-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f977.svg b/public/emoji/1f977.svg
new file mode 100644
index 000000000..84be7d7af
--- /dev/null
+++ b/public/emoji/1f977.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f978.svg b/public/emoji/1f978.svg
new file mode 100644
index 000000000..6d1e4e113
--- /dev/null
+++ b/public/emoji/1f978.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f98a.svg b/public/emoji/1f98a.svg
index 13704a415..2cb2f986d 100644
--- a/public/emoji/1f98a.svg
+++ b/public/emoji/1f98a.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f996.svg b/public/emoji/1f996.svg
index 64b68d75a..73b0291cc 100644
--- a/public/emoji/1f996.svg
+++ b/public/emoji/1f996.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f997.svg b/public/emoji/1f997.svg
index f26413fdd..6f0476dcc 100644
--- a/public/emoji/1f997.svg
+++ b/public/emoji/1f997.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9a3.svg b/public/emoji/1f9a3.svg
new file mode 100644
index 000000000..1aa87190b
--- /dev/null
+++ b/public/emoji/1f9a3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9a4.svg b/public/emoji/1f9a4.svg
new file mode 100644
index 000000000..1dbac1e31
--- /dev/null
+++ b/public/emoji/1f9a4.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9ab.svg b/public/emoji/1f9ab.svg
new file mode 100644
index 000000000..7967d6780
--- /dev/null
+++ b/public/emoji/1f9ab.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9ac.svg b/public/emoji/1f9ac.svg
new file mode 100644
index 000000000..c8156813b
--- /dev/null
+++ b/public/emoji/1f9ac.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9ad.svg b/public/emoji/1f9ad.svg
new file mode 100644
index 000000000..6904e81a5
--- /dev/null
+++ b/public/emoji/1f9ad.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3fb-200d-2640-fe0f.svg
index 361bab6ac..e52e0d8d5 100644
--- a/public/emoji/1f9b9-1f3fb-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fb-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3fb-200d-2642-fe0f.svg
index 0b8da862a..ced012a41 100644
--- a/public/emoji/1f9b9-1f3fb-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fb-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3fc-200d-2640-fe0f.svg
index f035f13c1..61c9be883 100644
--- a/public/emoji/1f9b9-1f3fc-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fc-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3fc-200d-2642-fe0f.svg
index e9ca2e0fc..67a93de7e 100644
--- a/public/emoji/1f9b9-1f3fc-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fc-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3fd-200d-2640-fe0f.svg
index 58999ae9a..eeb4f0742 100644
--- a/public/emoji/1f9b9-1f3fd-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fd-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3fd-200d-2642-fe0f.svg
index e873933f2..091e36b26 100644
--- a/public/emoji/1f9b9-1f3fd-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fd-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3fe-200d-2640-fe0f.svg
index 04120e37a..463ee894d 100644
--- a/public/emoji/1f9b9-1f3fe-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fe-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3fe-200d-2642-fe0f.svg
index f7e3d5611..008a07f12 100644
--- a/public/emoji/1f9b9-1f3fe-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-1f3fe-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
index 5dadcd8b6..a110d6d47 100644
--- a/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-1f3ff-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg
index e5d56cb36..ec17e3b57 100644
--- a/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-1f3ff-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-200d-2640-fe0f.svg b/public/emoji/1f9b9-200d-2640-fe0f.svg
index 7d6953ea2..97ee77199 100644
--- a/public/emoji/1f9b9-200d-2640-fe0f.svg
+++ b/public/emoji/1f9b9-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9b9-200d-2642-fe0f.svg b/public/emoji/1f9b9-200d-2642-fe0f.svg
index ed0e66c34..6c2076133 100644
--- a/public/emoji/1f9b9-200d-2642-fe0f.svg
+++ b/public/emoji/1f9b9-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9cb.svg b/public/emoji/1f9cb.svg
new file mode 100644
index 000000000..8cb61784d
--- /dev/null
+++ b/public/emoji/1f9cb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f9ce-1f3fb-200d-2640-fe0f.svg
index 77c8b9ba1..37507496e 100644
--- a/public/emoji/1f9ce-1f3fb-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fb-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f9ce-1f3fb-200d-2642-fe0f.svg
index 09e6f4d9b..97de596dc 100644
--- a/public/emoji/1f9ce-1f3fb-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fb-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fb.svg b/public/emoji/1f9ce-1f3fb.svg
index 9e269bd2a..6f97b1b9d 100644
--- a/public/emoji/1f9ce-1f3fb.svg
+++ b/public/emoji/1f9ce-1f3fb.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f9ce-1f3fc-200d-2640-fe0f.svg
index cf2ca0cc9..ee5bf15ae 100644
--- a/public/emoji/1f9ce-1f3fc-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fc-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9ce-1f3fc-200d-2642-fe0f.svg
index 9bd2fc01d..e51865777 100644
--- a/public/emoji/1f9ce-1f3fc-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fc-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fc.svg b/public/emoji/1f9ce-1f3fc.svg
index bdd410e2e..0977ee6d0 100644
--- a/public/emoji/1f9ce-1f3fc.svg
+++ b/public/emoji/1f9ce-1f3fc.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f9ce-1f3fd-200d-2640-fe0f.svg
index ed058b9d9..e210695d5 100644
--- a/public/emoji/1f9ce-1f3fd-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fd-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f9ce-1f3fd-200d-2642-fe0f.svg
index 10df60c9b..269c7cec9 100644
--- a/public/emoji/1f9ce-1f3fd-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fd-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fd.svg b/public/emoji/1f9ce-1f3fd.svg
index 465db1df1..7fe4f06eb 100644
--- a/public/emoji/1f9ce-1f3fd.svg
+++ b/public/emoji/1f9ce-1f3fd.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f9ce-1f3fe-200d-2640-fe0f.svg
index 83206f8d2..e2b093098 100644
--- a/public/emoji/1f9ce-1f3fe-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fe-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f9ce-1f3fe-200d-2642-fe0f.svg
index fb24b6dfb..54e4ba95e 100644
--- a/public/emoji/1f9ce-1f3fe-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-1f3fe-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3fe.svg b/public/emoji/1f9ce-1f3fe.svg
index e84e1235a..2f70944a6 100644
--- a/public/emoji/1f9ce-1f3fe.svg
+++ b/public/emoji/1f9ce-1f3fe.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg
index 442cb9c49..0f2dc0c41 100644
--- a/public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f9ce-1f3ff-200d-2642-fe0f.svg
index aba0cb467..b51d7ff89 100644
--- a/public/emoji/1f9ce-1f3ff-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-1f3ff-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-1f3ff.svg b/public/emoji/1f9ce-1f3ff.svg
index c07e81fcf..542a60412 100644
--- a/public/emoji/1f9ce-1f3ff.svg
+++ b/public/emoji/1f9ce-1f3ff.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-200d-2640-fe0f.svg b/public/emoji/1f9ce-200d-2640-fe0f.svg
index 89c9ff428..40b5754e1 100644
--- a/public/emoji/1f9ce-200d-2640-fe0f.svg
+++ b/public/emoji/1f9ce-200d-2640-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce-200d-2642-fe0f.svg b/public/emoji/1f9ce-200d-2642-fe0f.svg
index 403d73eb3..1c8ddcd8a 100644
--- a/public/emoji/1f9ce-200d-2642-fe0f.svg
+++ b/public/emoji/1f9ce-200d-2642-fe0f.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9ce.svg b/public/emoji/1f9ce.svg
index 60fe53792..86a60cb15 100644
--- a/public/emoji/1f9ce.svg
+++ b/public/emoji/1f9ce.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-1f37c.svg b/public/emoji/1f9d1-1f3fb-200d-1f37c.svg
new file mode 100644
index 000000000..624d945f6
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-1f384.svg b/public/emoji/1f9d1-1f3fb-200d-1f384.svg
new file mode 100644
index 000000000..e204d68af
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..6542ef089
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..92180dc5a
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..7672a8360
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..3a1f8c8d7
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..6b9ed98f5
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..7aa9cfbbe
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..adc94eefa
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..e9257bf4e
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fb-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-1f37c.svg b/public/emoji/1f9d1-1f3fc-200d-1f37c.svg
new file mode 100644
index 000000000..cd1b853e1
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-1f384.svg b/public/emoji/1f9d1-1f3fc-200d-1f384.svg
new file mode 100644
index 000000000..c86b6d37b
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..fc339202d
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..e28ecdf2a
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..182f55dee
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..77ad1c25b
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..d2db4a4fd
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..c5fa071ab
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..073ed3291
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..330dd09f8
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fc-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-1f37c.svg b/public/emoji/1f9d1-1f3fd-200d-1f37c.svg
new file mode 100644
index 000000000..c1d45aa32
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-1f384.svg b/public/emoji/1f9d1-1f3fd-200d-1f384.svg
new file mode 100644
index 000000000..0c6066634
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..338be2186
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..606aa6c7c
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..32425140b
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..c6dc1cab4
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..c7ff54596
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..70f5da4cc
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..3a1913fa2
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..7f5f2f028
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fd-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-1f37c.svg b/public/emoji/1f9d1-1f3fe-200d-1f37c.svg
new file mode 100644
index 000000000..a4f6e769c
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-1f384.svg b/public/emoji/1f9d1-1f3fe-200d-1f384.svg
new file mode 100644
index 000000000..fb94c66c2
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..5c4c22eb2
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..a88fe5196
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..f5305f0d7
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..995b238d1
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..5ee06ffc9
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..a4056f613
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..96667d842
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff.svg b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
new file mode 100644
index 000000000..e7440744f
--- /dev/null
+++ b/public/emoji/1f9d1-1f3fe-200d-2764-fe0f-200d-1f9d1-1f3ff.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-1f37c.svg b/public/emoji/1f9d1-1f3ff-200d-1f37c.svg
new file mode 100644
index 000000000..4e75f50f2
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-1f384.svg b/public/emoji/1f9d1-1f3ff-200d-1f384.svg
new file mode 100644
index 000000000..52121d13f
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..9c1bd5769
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..2d11a919f
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..39dc1d9e8
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..57616f71c
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f48b-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
new file mode 100644
index 000000000..a1895b892
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
new file mode 100644
index 000000000..49c9ef267
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
new file mode 100644
index 000000000..be650e401
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fd.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe.svg b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
new file mode 100644
index 000000000..0bed3d534
--- /dev/null
+++ b/public/emoji/1f9d1-1f3ff-200d-2764-fe0f-200d-1f9d1-1f3fe.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-200d-1f37c.svg b/public/emoji/1f9d1-200d-1f37c.svg
new file mode 100644
index 000000000..f2bf52948
--- /dev/null
+++ b/public/emoji/1f9d1-200d-1f37c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d1-200d-1f384.svg b/public/emoji/1f9d1-200d-1f384.svg
new file mode 100644
index 000000000..78bde98ee
--- /dev/null
+++ b/public/emoji/1f9d1-200d-1f384.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f9d4-1f3fb-200d-2640-fe0f.svg
new file mode 100644
index 000000000..31109bd46
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fb-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f9d4-1f3fb-200d-2642-fe0f.svg
new file mode 100644
index 000000000..07e401366
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fb-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fc-200d-2640-fe0f.svg b/public/emoji/1f9d4-1f3fc-200d-2640-fe0f.svg
new file mode 100644
index 000000000..96acdb542
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fc-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fc-200d-2642-fe0f.svg b/public/emoji/1f9d4-1f3fc-200d-2642-fe0f.svg
new file mode 100644
index 000000000..168fa82ba
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fc-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f9d4-1f3fd-200d-2640-fe0f.svg
new file mode 100644
index 000000000..9fb7aeaf8
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fd-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f9d4-1f3fd-200d-2642-fe0f.svg
new file mode 100644
index 000000000..01e936599
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fd-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f9d4-1f3fe-200d-2640-fe0f.svg
new file mode 100644
index 000000000..489e27951
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fe-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3fe-200d-2642-fe0f.svg b/public/emoji/1f9d4-1f3fe-200d-2642-fe0f.svg
new file mode 100644
index 000000000..27a6f756a
--- /dev/null
+++ b/public/emoji/1f9d4-1f3fe-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3ff-200d-2640-fe0f.svg b/public/emoji/1f9d4-1f3ff-200d-2640-fe0f.svg
new file mode 100644
index 000000000..31f829155
--- /dev/null
+++ b/public/emoji/1f9d4-1f3ff-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-1f3ff-200d-2642-fe0f.svg b/public/emoji/1f9d4-1f3ff-200d-2642-fe0f.svg
new file mode 100644
index 000000000..34a7f5e27
--- /dev/null
+++ b/public/emoji/1f9d4-1f3ff-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-200d-2640-fe0f.svg b/public/emoji/1f9d4-200d-2640-fe0f.svg
new file mode 100644
index 000000000..08af35c5b
--- /dev/null
+++ b/public/emoji/1f9d4-200d-2640-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9d4-200d-2642-fe0f.svg b/public/emoji/1f9d4-200d-2642-fe0f.svg
new file mode 100644
index 000000000..fcd2cdf08
--- /dev/null
+++ b/public/emoji/1f9d4-200d-2642-fe0f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1f9e1.svg b/public/emoji/1f9e1.svg
index 26ae9e7da..0e61b1485 100644
--- a/public/emoji/1f9e1.svg
+++ b/public/emoji/1f9e1.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1f9e9.svg b/public/emoji/1f9e9.svg
index 1505f6846..ae4bf5668 100644
--- a/public/emoji/1f9e9.svg
+++ b/public/emoji/1f9e9.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/1fa74.svg b/public/emoji/1fa74.svg
new file mode 100644
index 000000000..585265a40
--- /dev/null
+++ b/public/emoji/1fa74.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa83.svg b/public/emoji/1fa83.svg
new file mode 100644
index 000000000..3de58a8f2
--- /dev/null
+++ b/public/emoji/1fa83.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa84.svg b/public/emoji/1fa84.svg
new file mode 100644
index 000000000..988c79888
--- /dev/null
+++ b/public/emoji/1fa84.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa85.svg b/public/emoji/1fa85.svg
new file mode 100644
index 000000000..a6b0f6026
--- /dev/null
+++ b/public/emoji/1fa85.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa86.svg b/public/emoji/1fa86.svg
new file mode 100644
index 000000000..fca9a3c81
--- /dev/null
+++ b/public/emoji/1fa86.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa96.svg b/public/emoji/1fa96.svg
new file mode 100644
index 000000000..462cbf5ee
--- /dev/null
+++ b/public/emoji/1fa96.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa97.svg b/public/emoji/1fa97.svg
new file mode 100644
index 000000000..c9c21ca2a
--- /dev/null
+++ b/public/emoji/1fa97.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa98.svg b/public/emoji/1fa98.svg
new file mode 100644
index 000000000..fa316b125
--- /dev/null
+++ b/public/emoji/1fa98.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa99.svg b/public/emoji/1fa99.svg
new file mode 100644
index 000000000..04944697a
--- /dev/null
+++ b/public/emoji/1fa99.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9a.svg b/public/emoji/1fa9a.svg
new file mode 100644
index 000000000..f33a04826
--- /dev/null
+++ b/public/emoji/1fa9a.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9b.svg b/public/emoji/1fa9b.svg
new file mode 100644
index 000000000..d0b988f66
--- /dev/null
+++ b/public/emoji/1fa9b.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9c.svg b/public/emoji/1fa9c.svg
new file mode 100644
index 000000000..cd3b979ed
--- /dev/null
+++ b/public/emoji/1fa9c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9d.svg b/public/emoji/1fa9d.svg
new file mode 100644
index 000000000..923a96de2
--- /dev/null
+++ b/public/emoji/1fa9d.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9e.svg b/public/emoji/1fa9e.svg
new file mode 100644
index 000000000..b263f10bc
--- /dev/null
+++ b/public/emoji/1fa9e.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fa9f.svg b/public/emoji/1fa9f.svg
new file mode 100644
index 000000000..8daaad668
--- /dev/null
+++ b/public/emoji/1fa9f.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa0.svg b/public/emoji/1faa0.svg
new file mode 100644
index 000000000..f5422d960
--- /dev/null
+++ b/public/emoji/1faa0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa1.svg b/public/emoji/1faa1.svg
new file mode 100644
index 000000000..a99cb160d
--- /dev/null
+++ b/public/emoji/1faa1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa2.svg b/public/emoji/1faa2.svg
new file mode 100644
index 000000000..fd6a64c1c
--- /dev/null
+++ b/public/emoji/1faa2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa3.svg b/public/emoji/1faa3.svg
new file mode 100644
index 000000000..7be64da1d
--- /dev/null
+++ b/public/emoji/1faa3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa4.svg b/public/emoji/1faa4.svg
new file mode 100644
index 000000000..a680fb706
--- /dev/null
+++ b/public/emoji/1faa4.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa5.svg b/public/emoji/1faa5.svg
new file mode 100644
index 000000000..9c9e61779
--- /dev/null
+++ b/public/emoji/1faa5.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa6.svg b/public/emoji/1faa6.svg
new file mode 100644
index 000000000..f4f3a89ed
--- /dev/null
+++ b/public/emoji/1faa6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa7.svg b/public/emoji/1faa7.svg
new file mode 100644
index 000000000..ac1646ba4
--- /dev/null
+++ b/public/emoji/1faa7.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1faa8.svg b/public/emoji/1faa8.svg
new file mode 100644
index 000000000..361fc032d
--- /dev/null
+++ b/public/emoji/1faa8.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab0.svg b/public/emoji/1fab0.svg
new file mode 100644
index 000000000..4b13d7e77
--- /dev/null
+++ b/public/emoji/1fab0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab1.svg b/public/emoji/1fab1.svg
new file mode 100644
index 000000000..1bc9b9a90
--- /dev/null
+++ b/public/emoji/1fab1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab2.svg b/public/emoji/1fab2.svg
new file mode 100644
index 000000000..57fd4bfab
--- /dev/null
+++ b/public/emoji/1fab2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab3.svg b/public/emoji/1fab3.svg
new file mode 100644
index 000000000..f8c8d7879
--- /dev/null
+++ b/public/emoji/1fab3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab4.svg b/public/emoji/1fab4.svg
new file mode 100644
index 000000000..92f1547ba
--- /dev/null
+++ b/public/emoji/1fab4.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab5.svg b/public/emoji/1fab5.svg
new file mode 100644
index 000000000..981dd2d1a
--- /dev/null
+++ b/public/emoji/1fab5.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fab6.svg b/public/emoji/1fab6.svg
new file mode 100644
index 000000000..8e70d6cd5
--- /dev/null
+++ b/public/emoji/1fab6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fac0.svg b/public/emoji/1fac0.svg
new file mode 100644
index 000000000..e6916d275
--- /dev/null
+++ b/public/emoji/1fac0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fac1.svg b/public/emoji/1fac1.svg
new file mode 100644
index 000000000..cfdf72f1f
--- /dev/null
+++ b/public/emoji/1fac1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fac2.svg b/public/emoji/1fac2.svg
new file mode 100644
index 000000000..5c0413cd5
--- /dev/null
+++ b/public/emoji/1fac2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad0.svg b/public/emoji/1fad0.svg
new file mode 100644
index 000000000..34e68d6b4
--- /dev/null
+++ b/public/emoji/1fad0.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad1.svg b/public/emoji/1fad1.svg
new file mode 100644
index 000000000..b0d524270
--- /dev/null
+++ b/public/emoji/1fad1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad2.svg b/public/emoji/1fad2.svg
new file mode 100644
index 000000000..b84ce6a1f
--- /dev/null
+++ b/public/emoji/1fad2.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad3.svg b/public/emoji/1fad3.svg
new file mode 100644
index 000000000..25c1842d3
--- /dev/null
+++ b/public/emoji/1fad3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad4.svg b/public/emoji/1fad4.svg
new file mode 100644
index 000000000..34a6215a8
--- /dev/null
+++ b/public/emoji/1fad4.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad5.svg b/public/emoji/1fad5.svg
new file mode 100644
index 000000000..1133788df
--- /dev/null
+++ b/public/emoji/1fad5.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/1fad6.svg b/public/emoji/1fad6.svg
new file mode 100644
index 000000000..9e6894daf
--- /dev/null
+++ b/public/emoji/1fad6.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/2694.svg b/public/emoji/2694.svg
index 3cf2fa46c..325b85f12 100644
--- a/public/emoji/2694.svg
+++ b/public/emoji/2694.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/emoji/2764-fe0f-200d-1f525.svg b/public/emoji/2764-fe0f-200d-1f525.svg
new file mode 100644
index 000000000..298dd0e15
--- /dev/null
+++ b/public/emoji/2764-fe0f-200d-1f525.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/2764-fe0f-200d-1fa79.svg b/public/emoji/2764-fe0f-200d-1fa79.svg
new file mode 100644
index 000000000..a7a38bd14
--- /dev/null
+++ b/public/emoji/2764-fe0f-200d-1fa79.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/public/emoji/sheet_10.png b/public/emoji/sheet_10.png
deleted file mode 100644
index 3ee92a1f1..000000000
Binary files a/public/emoji/sheet_10.png and /dev/null differ
diff --git a/public/emoji/sheet_13.png b/public/emoji/sheet_13.png
new file mode 100644
index 000000000..1ba12b619
Binary files /dev/null and b/public/emoji/sheet_13.png differ
diff --git a/scalingo.json b/scalingo.json
index 324356df0..51d9b5b9f 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -1,8 +1,8 @@
{
"name": "Mastodon",
"description": "A GNU Social-compatible microblogging server",
- "repository": "https://github.com/tootsuite/mastodon",
- "logo": "https://github.com/tootsuite.png",
+ "repository": "https://github.com/mastodon/mastodon",
+ "logo": "https://github.com/mastodon.png",
"env": {
"LOCAL_DOMAIN": {
"description": "The domain that your Mastodon instance will run on (this can be appname.scalingo.io or a custom domain)",
diff --git a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
index d373f56bd..3a382ff27 100644
--- a/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
+++ b/spec/controllers/activitypub/followers_synchronizations_controller_spec.rb
@@ -5,11 +5,13 @@ RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controll
let!(:follower_1) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/a') }
let!(:follower_2) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/users/b') }
let!(:follower_3) { Fabricate(:account, domain: 'foo.com', uri: 'https://foo.com/users/a') }
+ let!(:follower_4) { Fabricate(:account, username: 'instance-actor', domain: 'example.com', uri: 'https://example.com') }
before do
follower_1.follow!(account)
follower_2.follow!(account)
follower_3.follow!(account)
+ follower_4.follow!(account)
end
before do
@@ -45,7 +47,7 @@ RSpec.describe ActivityPub::FollowersSynchronizationsController, type: :controll
it 'returns orderedItems with followers from example.com' do
expect(body[:orderedItems]).to be_an Array
- expect(body[:orderedItems].sort).to eq [follower_1.uri, follower_2.uri]
+ expect(body[:orderedItems].sort).to eq [follower_4.uri, follower_1.uri, follower_2.uri]
end
it 'returns private Cache-Control header' do
diff --git a/spec/controllers/activitypub/outboxes_controller_spec.rb b/spec/controllers/activitypub/outboxes_controller_spec.rb
index d23f2c17c..1722690db 100644
--- a/spec/controllers/activitypub/outboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/outboxes_controller_spec.rb
@@ -55,6 +55,10 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
it_behaves_like 'cachable response'
+ it 'does not have a Vary header' do
+ expect(response.headers['Vary']).to be_nil
+ end
+
context 'when account is permanently suspended' do
before do
account.suspend!
@@ -96,6 +100,10 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
it_behaves_like 'cachable response'
+ it 'returns Vary header with Signature' do
+ expect(response.headers['Vary']).to include 'Signature'
+ end
+
context 'when account is permanently suspended' do
before do
account.suspend!
@@ -144,7 +152,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
end
it 'returns private Cache-Control header' do
- expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+ expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
end
end
@@ -170,7 +178,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
end
it 'returns private Cache-Control header' do
- expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+ expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
end
end
@@ -195,7 +203,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
end
it 'returns private Cache-Control header' do
- expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+ expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
end
end
@@ -220,7 +228,7 @@ RSpec.describe ActivityPub::OutboxesController, type: :controller do
end
it 'returns private Cache-Control header' do
- expect(response.headers['Cache-Control']).to eq 'max-age=0, private'
+ expect(response.headers['Cache-Control']).to eq 'max-age=60, private'
end
end
end
diff --git a/spec/controllers/api/v1/accounts/notes_controller_spec.rb b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
new file mode 100644
index 000000000..0a2957fed
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+describe Api::V1::Accounts::NotesController do
+ render_views
+
+ let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts') }
+ let(:account) { Fabricate(:account) }
+ let(:comment) { 'foo' }
+
+ before do
+ allow(controller).to receive(:doorkeeper_token) { token }
+ end
+
+ describe 'POST #create' do
+ subject do
+ post :create, params: { account_id: account.id, comment: comment }
+ end
+
+ context 'when account note has reasonable length' do
+ let(:comment) { 'foo' }
+
+ it 'returns http success' do
+ subject
+ expect(response).to have_http_status(200)
+ end
+
+ it 'updates account note' do
+ subject
+ expect(AccountNote.find_by(account_id: user.account.id, target_account_id: account.id).comment).to eq comment
+ end
+ end
+
+ context 'when account note exceends allowed length' do
+ let(:comment) { 'a' * 2_001 }
+
+ it 'returns 422' do
+ subject
+ expect(response).to have_http_status(422)
+ end
+
+ it 'does not create account note' do
+ subject
+ expect(AccountNote.where(account_id: user.account.id, target_account_id: account.id).exists?).to be_falsey
+ end
+ end
+ end
+end
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index d03ae51e8..f718f5dd9 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -206,6 +206,38 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
end
+ context 'using email and password after an unfinished log-in attempt to a 2FA-protected account' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ end
+
+ before do
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, password: user.password } }
+ end
+
+ it 'renders two factor authentication page' do
+ expect(controller).to render_template("two_factor")
+ expect(controller).to render_template(partial: "_otp_authentication_form")
+ end
+ end
+
+ context 'using email and password after an unfinished log-in attempt with a sign-in token challenge' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
+ end
+
+ before do
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, password: user.password } }
+ end
+
+ it 'renders two factor authentication page' do
+ expect(controller).to render_template("two_factor")
+ expect(controller).to render_template(partial: "_otp_authentication_form")
+ end
+ end
+
context 'using upcase email and password' do
before do
post :create, params: { user: { email: user.email.upcase, password: user.password } }
@@ -231,6 +263,21 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
end
+ context 'using a valid OTP, attempting to leverage previous half-login to bypass password auth' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
+ end
+
+ before do
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, otp_attempt: user.current_otp } }, session: { attempt_user_updated_at: user.updated_at.to_s }
+ end
+
+ it "doesn't log the user in" do
+ expect(controller.current_user).to be_nil
+ end
+ end
+
context 'when the server has an decryption error' do
before do
allow_any_instance_of(User).to receive(:validate_and_consume_otp!).and_raise(OpenSSL::Cipher::CipherError)
@@ -380,6 +427,52 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
end
+ context 'using email and password after an unfinished log-in attempt to a 2FA-protected account' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ end
+
+ before do
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, password: user.password } }
+ end
+
+ it 'renders sign in token authentication page' do
+ expect(controller).to render_template("sign_in_token")
+ end
+
+ it 'generates sign in token' do
+ expect(user.reload.sign_in_token).to_not be_nil
+ end
+
+ it 'sends sign in token e-mail' do
+ expect(UserMailer).to have_received(:sign_in_token)
+ end
+ end
+
+ context 'using email and password after an unfinished log-in attempt with a sign-in token challenge' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
+ end
+
+ before do
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, password: user.password } }
+ end
+
+ it 'renders sign in token authentication page' do
+ expect(controller).to render_template("sign_in_token")
+ end
+
+ it 'generates sign in token' do
+ expect(user.reload.sign_in_token).to_not be_nil
+ end
+
+ it 'sends sign in token e-mail' do
+ expect(UserMailer).to have_received(:sign_in_token).with(user, any_args)
+ end
+ end
+
context 'using a valid sign in token' do
before do
user.generate_sign_in_token && user.save
@@ -395,6 +488,22 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
end
+ context 'using a valid sign in token, attempting to leverage previous half-login to bypass password auth' do
+ let!(:other_user) do
+ Fabricate(:user, email: 'z@y.com', password: 'abcdefgh', otp_required_for_login: false, current_sign_in_at: 1.month.ago)
+ end
+
+ before do
+ user.generate_sign_in_token && user.save
+ post :create, params: { user: { email: other_user.email, password: other_user.password } }
+ post :create, params: { user: { email: user.email, sign_in_token_attempt: user.sign_in_token } }, session: { attempt_user_updated_at: user.updated_at.to_s }
+ end
+
+ it "doesn't log the user in" do
+ expect(controller.current_user).to be_nil
+ end
+ end
+
context 'using an invalid sign in token' do
before do
post :create, params: { user: { sign_in_token_attempt: 'wrongotp' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
@@ -410,4 +519,33 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
end
end
+
+ describe 'GET #webauthn_options' do
+ context 'with WebAuthn and OTP enabled as second factor' do
+ let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}" }
+
+ let(:fake_client) { WebAuthn::FakeClient.new(domain) }
+
+ let!(:user) do
+ Fabricate(:user, email: 'x@y.com', password: 'abcdefgh', otp_required_for_login: true, otp_secret: User.generate_otp_secret(32))
+ end
+
+ before do
+ user.update(webauthn_id: WebAuthn.generate_user_id)
+ public_key_credential = WebAuthn::Credential.from_create(fake_client.create)
+ user.webauthn_credentials.create(
+ nickname: 'SecurityKeyNickname',
+ external_id: public_key_credential.id,
+ public_key: public_key_credential.public_key,
+ sign_count: '1000'
+ )
+ post :create, params: { user: { email: user.email, password: user.password } }
+ end
+
+ it 'returns http success' do
+ get :webauthn_options
+ expect(response).to have_http_status :ok
+ end
+ end
+ end
end
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index f6d55f693..006274169 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe FollowerAccountsController do
render_views
- let(:alice) { Fabricate(:account, username: 'alice') }
+ let(:alice) { Fabricate(:user).account }
let(:follower0) { Fabricate(:account) }
let(:follower1) { Fabricate(:account) }
@@ -101,6 +101,23 @@ describe FollowerAccountsController do
expect(body['partOf']).to be_blank
end
+ context 'when account hides their network' do
+ before do
+ alice.user.settings.hide_network = true
+ end
+
+ it 'returns followers count' do
+ expect(body['totalItems']).to eq 2
+ end
+
+ it 'does not return items' do
+ expect(body['items']).to be_blank
+ expect(body['orderedItems']).to be_blank
+ expect(body['first']).to be_blank
+ expect(body['last']).to be_blank
+ end
+ end
+
context 'when account is permanently suspended' do
before do
alice.suspend!
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 0fc0967a6..7ec0e3d06 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe FollowingAccountsController do
render_views
- let(:alice) { Fabricate(:account, username: 'alice') }
+ let(:alice) { Fabricate(:user).account }
let(:followee0) { Fabricate(:account) }
let(:followee1) { Fabricate(:account) }
@@ -101,6 +101,23 @@ describe FollowingAccountsController do
expect(body['partOf']).to be_blank
end
+ context 'when account hides their network' do
+ before do
+ alice.user.settings.hide_network = true
+ end
+
+ it 'returns followers count' do
+ expect(body['totalItems']).to eq 2
+ end
+
+ it 'does not return items' do
+ expect(body['items']).to be_blank
+ expect(body['orderedItems']).to be_blank
+ expect(body['first']).to be_blank
+ expect(body['last']).to be_blank
+ end
+ end
+
context 'when account is permanently suspended' do
before do
alice.suspend!
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 8d5c4774f..92ab401c9 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -59,6 +59,10 @@ describe Settings::DeletesController do
expect(user.account.reload).to be_suspended
end
+ it 'does not create an email block' do
+ expect(CanonicalEmailBlock.block?(user.email)).to be false
+ end
+
context 'when suspended' do
let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb
index 1075456f3..8574d369d 100644
--- a/spec/controllers/well_known/webfinger_controller_spec.rb
+++ b/spec/controllers/well_known/webfinger_controller_spec.rb
@@ -24,6 +24,10 @@ describe WellKnown::WebfingerController, type: :controller do
expect(response).to have_http_status(200)
end
+ it 'does not set a Vary header' do
+ expect(response.headers['Vary']).to be_nil
+ end
+
it 'returns application/jrd+json' do
expect(response.media_type).to eq 'application/jrd+json'
end
diff --git a/spec/fixtures/requests/oembed_youtube.html b/spec/fixtures/requests/oembed_youtube.html
new file mode 100644
index 000000000..1508e4dd9
--- /dev/null
+++ b/spec/fixtures/requests/oembed_youtube.html
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/spec/fixtures/xml/mastodon.atom b/spec/fixtures/xml/mastodon.atom
deleted file mode 100644
index 92921a938..000000000
--- a/spec/fixtures/xml/mastodon.atom
+++ /dev/null
@@ -1,261 +0,0 @@
-
-