diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 22:43:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-09 22:43:21 +0200 |
commit | 14aa7b3c76c4d011a9ea3c05b007343b8ca1e203 (patch) | |
tree | d3147d9d92763b38631731422a3f4f9af3386314 /app/javascript/mastodon/locales/ast.json | |
parent | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (diff) | |
parent | 63a39ae2faba65d0234a9f9e261e31dbf4bd5adb (diff) |
Merge pull request #2170 from ClearlyClaire/glitch-soc/merge-upstream
* Bump addressable from 2.8.1 to 2.8.2 (#24392) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump typescript from 4.9.5 to 5.0.3 (#24398) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add typechecking in CI (#24405) * HTML string attributes set as booleans (#24408) * Ensure tabIndex is number instead of string (#24409) * Fix styling regressions from RTL layout refactor (#24415) * Enable Stylelint property-no-unknown (#24404) * SUBMIT doesn't exist on XMLHttpRequest (#24423) * Set marginRight as string (#24422) * Update display_media typing to string (#24416) * Bump aws-sdk-s3 from 1.119.2 to 1.120.0 (#24401) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump capybara from 3.38.0 to 3.39.0 (#24395) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump puma from 6.1.1 to 6.2.1 (#24402) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rubocop from 1.48.1 to 1.49.0 (#24387) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix height of announcements not being updated when using reduced animations (#24354) * Check for missing JSON translations (#24338) * Fix user archive takeouts when using OpenStack Swift (#24431) * Fix DevContainer post-create warnings (#23977) * New Crowdin updates (#24378) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Bump version to v4.1.2 (#24427) * Fix user settings migration script failing in some cases (#24453) * Fix account header image missing in low-res (#24433) * Remove Array.prototype.includes polyfill (#24234) * Remove duplicate ca-certificates Docker install (#24231) * Remove unused methods in 2FA OTP Auth Controller (#24220) * Update Node.js to 16.20.0 (#24316) * Expand coverage for "system checks" (#24216) * Fix loading spinner + infinite scroll for private mentions (#24446) * Fix tooltip for dates without time (#24244) * Fix crash in NotifyService when trying to send an email notification for post edits (#24460) * [Glitch] HTML string attributes set as booleans Port a425915ce7d1148e9505c87889936c4c497061dd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] SUBMIT doesn't exist on XMLHttpRequest Port ab3f23da916c8578148fe92fe008da19b8a7ed02 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Set marginRight as string Port 927b2fd1386bce6fda1d2ff53ceadd82289d77ce to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Update display_media typing to string Port 17b2fd217730e6fd598aa6664373d8d7779c28c1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix height of announcements not being updated when using reduced animations Port ffd5b2eea4503c2ee389c7aa5dff9c51dbf9f846 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix account header image missing in low-res Port d7b8c6db7ec4d9b3fe39cbf8f1b32d152e70b8f1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Remove Array.prototype.includes polyfill Port c0886dee1480cecedb7e8b152c848f061ab7f81e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix tooltip for dates without time Port aa136cf2fa177af1fea59279cb8bab0b2a042b2b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Enable Stylelint property-no-unknown Port cd14f712ad9f5a6ebdbec8c9b87740cd76d949e7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix loading spinner + infinite scroll for private mentions Port 9ef9974ff207fe91291c81c7a9b9bb83e0df8e16 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Ensure tabIndex is number instead of string Port ec0c104bf25f2689c31bb79f9f447be1a9b3da7f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix user settings migration script failing in some cases * Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales` * Run `yarn manage:translations` --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nick Schonning <nschonni@gmail.com> Co-authored-by: Christian Schmidt <github@chsc.dk> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Matt Jankowski <matt@jankowski.online>
Diffstat (limited to 'app/javascript/mastodon/locales/ast.json')
-rw-r--r-- | app/javascript/mastodon/locales/ast.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json index fd4959185..c0920bbec 100644 --- a/app/javascript/mastodon/locales/ast.json +++ b/app/javascript/mastodon/locales/ast.json @@ -20,7 +20,7 @@ "account.blocked": "Blocked", "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal", "account.cancel_follow_request": "Withdraw follow request", - "account.direct": "Privately mention @{name}", + "account.direct": "Mentar a @{name} per privao", "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos", "account.domain_blocked": "Domain blocked", "account.edit_profile": "Editar el perfil", @@ -102,7 +102,7 @@ "column.blocks": "Perfiles bloquiaos", "column.bookmarks": "Marcadores", "column.community": "Llinia de tiempu llocal", - "column.direct": "Private mentions", + "column.direct": "Menciones privaes", "column.directory": "Browse profiles", "column.domain_blocks": "Dominios bloquiaos", "column.favourites": "Favoritos", @@ -216,7 +216,7 @@ "empty_column.blocks": "Entá nun bloquiesti a nengún perfil.", "empty_column.bookmarked_statuses": "Entá nun tienes nengún artículu en Marcadores. Cuando amiestes dalgún, apaez equí.", "empty_column.community": "La llinia de tiempu llocal ta balera. ¡Espubliza daqué públicamente pa comenzar l'alderique!", - "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.", + "empty_column.direct": "Entá nun tienes nenguna mención privada. Cuando unvies o recibas dalguna, apaez equí.", "empty_column.domain_blocks": "Entá nun hai nengún dominiu bloquiáu.", "empty_column.explore_statuses": "Agora nun hai nada en tendencia. ¡Volvi equí dempués!", "empty_column.favourited_statuses": "Entá nun marquesti nengún artículu como favoritu. Cuando marques dalgún, apaez equí.", @@ -314,7 +314,7 @@ "keyboard_shortcuts.column": "Enfocar una columna", "keyboard_shortcuts.compose": "Enfocar l'área de composición", "keyboard_shortcuts.description": "Descripción", - "keyboard_shortcuts.direct": "to open direct messages column", + "keyboard_shortcuts.direct": "p'abrir la columna de les menciones privaes", "keyboard_shortcuts.down": "Baxar na llista", "keyboard_shortcuts.enter": "Abrir un artículu", "keyboard_shortcuts.favourite": "Marcar un artículu como favoritu", @@ -376,7 +376,7 @@ "navigation_bar.bookmarks": "Marcadores", "navigation_bar.community_timeline": "Llinia de tiempu llocal", "navigation_bar.compose": "Compose new post", - "navigation_bar.direct": "Private mentions", + "navigation_bar.direct": "Menciones privaes", "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Dominios bloquiaos", "navigation_bar.edit_profile": "Editar el perfil", @@ -559,8 +559,8 @@ "status.copy": "Copiar l'enllaz al artículu", "status.delete": "Desaniciar", "status.detailed_status": "Detailed conversation view", - "status.direct": "Privately mention @{name}", - "status.direct_indicator": "Private mention", + "status.direct": "Mentar a @{name} per privao", + "status.direct_indicator": "Mención privada", "status.edit": "Edit", "status.edited": "Editóse'l {date}", "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}", |