From d803458239e8545d4d9f115ccf92ab867c64477a Mon Sep 17 00:00:00 2001 From: "xan.lol" Date: Mon, 17 Nov 2025 23:21:56 -0800 Subject: [PATCH] messages.po all must yarn --- src/locale/locales/an/messages.po | 919 ++++----------------- src/locale/locales/ast/messages.po | 917 ++++----------------- src/locale/locales/ca/messages.po | 1109 ++++--------------------- src/locale/locales/cy/messages.po | 1102 ++++--------------------- src/locale/locales/da/messages.po | 935 ++++----------------- src/locale/locales/de/messages.po | 1109 ++++--------------------- src/locale/locales/el/messages.po | 919 ++++----------------- src/locale/locales/en-GB/messages.po | 1109 ++++--------------------- src/locale/locales/en/messages.po | 366 +++------ src/locale/locales/eo/messages.po | 938 ++++----------------- src/locale/locales/es/messages.po | 929 ++++----------------- src/locale/locales/eu/messages.po | 1102 ++++--------------------- src/locale/locales/fi/messages.po | 919 ++++----------------- src/locale/locales/fr/messages.po | 1107 ++++--------------------- src/locale/locales/fy/messages.po | 929 ++++----------------- src/locale/locales/ga/messages.po | 919 ++++----------------- src/locale/locales/gd/messages.po | 929 ++++----------------- src/locale/locales/gl/messages.po | 919 ++++----------------- src/locale/locales/hi/messages.po | 919 ++++----------------- src/locale/locales/hu/messages.po | 1109 ++++--------------------- src/locale/locales/ia/messages.po | 929 ++++----------------- src/locale/locales/id/messages.po | 929 ++++----------------- src/locale/locales/it/messages.po | 1109 ++++--------------------- src/locale/locales/ja/messages.po | 1109 ++++--------------------- src/locale/locales/km/messages.po | 914 ++++----------------- src/locale/locales/ko/messages.po | 1117 ++++---------------------- src/locale/locales/ne/messages.po | 919 ++++----------------- src/locale/locales/nl/messages.po | 924 ++++----------------- src/locale/locales/pl/messages.po | 915 ++++----------------- src/locale/locales/pt-BR/messages.po | 1061 ++++-------------------- src/locale/locales/pt-PT/messages.po | 1109 ++++--------------------- src/locale/locales/ro/messages.po | 1113 ++++--------------------- src/locale/locales/ru/messages.po | 927 ++++----------------- src/locale/locales/sv/messages.po | 1109 ++++--------------------- src/locale/locales/th/messages.po | 919 ++++----------------- src/locale/locales/tr/messages.po | 1109 ++++--------------------- src/locale/locales/uk/messages.po | 917 ++++----------------- src/locale/locales/vi/messages.po | 929 ++++----------------- src/locale/locales/zh-CN/messages.po | 1097 ++++--------------------- src/locale/locales/zh-HK/messages.po | 1100 ++++--------------------- src/locale/locales/zh-TW/messages.po | 1097 ++++--------------------- 41 files changed, 6345 insertions(+), 34211 deletions(-) diff --git a/src/locale/locales/an/messages.po b/src/locale/locales/an/messages.po index 1a49fdc46..d24469b25 100644 --- a/src/locale/locales/an/messages.po +++ b/src/locale/locales/an/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidors}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seguindo} other {seguindo}}" +msgstr "{0, plural, one {seguindo} other {seguindo}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {me-fa-goyo} other {me-fa-goyos}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publicación} other {publicacions}}" +msgstr "{0, plural, one {publicación} other {publicacions}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {cita} other {citas}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republicación} other {republicacions}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {cita} other {citas}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republicación} other {republicacions}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} en {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Accesibilidat" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Achustes d'accesibilidat" +msgstr "Achustes d'accesibilidat<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta" +msgstr "Cuenta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Cuenta blocada" @@ -661,26 +634,18 @@ msgstr "Cuenta silenciada per lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcions de cuenta" +msgstr "Opcions de cuenta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Cuenta sacada de l'acceso rápido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Cuenta desblocada" @@ -770,7 +735,7 @@ msgstr "Anyadir una atra cuenta" msgid "Add another post" msgstr "Anyadir una atra publicación" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Conteniu adulto" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema no incluyiu en estas opcions" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamiento antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Las claus d'aplicación han de tener a lo menos 4 carácters" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Claus d'aplicación" +msgstr "Claus d'aplicación<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Claus de l'app" @@ -1283,19 +1225,12 @@ msgstr "Revisón d'a suspensión" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelar esta decisión" +msgstr "Apelar esta decisión<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Apariencia" @@ -1307,23 +1242,14 @@ msgstr "Aplicar canals recomendadas predeterminadas" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archivau dende {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archivau dende {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publicación archivada" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversario" +msgstr "Aniversario<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blocar" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blocar cuenta" @@ -1546,15 +1446,8 @@ msgstr "Blocar cuentas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocar y borrar" +msgstr "Blocar y borrar<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blocar y/u borrar la conversa" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blocar lista" @@ -1574,18 +1467,14 @@ msgstr "Blocar usuario" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocar usuario" +msgstr "Blocar usuario<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blocau" @@ -1617,40 +1506,18 @@ msgstr "Lo bloqueyo ye publico. Si blocas una cuenta no podrán responder en os #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Si blocas a etiquetador encara podrán seguir aplicando etiquetas a la tuya cuenta, pero privará que respondan en os tuyos filos, te mencionen u interactúen con tu de garra traza." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky no puede confirmar l'autenticidat d'a data declarada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Si blocas a etiquetador encara podrán seguir aplicando etiquetas a la tuya cuenta, pero privará que respondan en os tuyos filos, te mencionen u interactúen con tu de garra traza.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky no puede confirmar l'autenticidat d'a data declarada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky ye un ret ubierto an que puez triar lo furnidor d'aloch. Si yes un desenrollador, puez alochar lo tuyo propio servidor." @@ -1702,13 +1569,9 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Explorar mas cuentas" @@ -1819,19 +1682,13 @@ msgstr "Camera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "Cancelar la reactivación y zarrar la sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar busqueda" +msgstr "Cancelar busqueda<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "No se puede interactuar con un usuario blocau" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Tacatot🐴 tacatat 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Zarra l'alerta d'actualización de clau" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Redactar la respuesta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimindo video..." @@ -2533,17 +2372,11 @@ msgstr "Copiar DID de l'autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar codigo" +msgstr "Copiar codigo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar DID" @@ -2705,7 +2538,7 @@ msgstr "Crear una cuenta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crea una cuenta" @@ -2766,15 +2599,8 @@ msgstr "Personalizau" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personaliza quí puede interactuar con esta publicación." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personaliza la tuya experiencia en Bluesky" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Fosco" @@ -2834,17 +2653,13 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Per Defecto" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "Iconos per defecto" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Desactivar Correu 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactivar la retroalimentación haptica" +msgstr "Desactivar la retroalimentación haptica<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Descubrir nuevas canals" msgid "Dismiss" msgstr "Descartar" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Descartar error" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Descargar Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Descargar fichero CAR" +msgstr "Descargar fichero CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar avatar" @@ -3626,7 +3423,7 @@ msgstr "Cambia a pantalla completa" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "I ha habiu una error en alzar lo fichero" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error en recibir la respuesta d'o captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Toz" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mencions u respuestas excesivas" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensaches excesivos u no deseyaus" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluyir a los usuarios que sigues" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Canal" @@ -4164,26 +3946,8 @@ msgstr "Rematar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Exercicio" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Exercicio<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4194,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seguir" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seguir tamién" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seguir tamién" @@ -4295,13 +4042,9 @@ msgstr "Seguidors que conoixes" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seguindo" @@ -4309,16 +4052,11 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo" +msgstr "Seguindo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Seguindo {0}" @@ -4405,15 +4143,8 @@ msgstr "La has olbidada?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "A sobén publica contenius no deseyaus" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Da-le una cara a lo tuyo perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violacions flagrants d'a Lei u d'os termens de servicio" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Da-le una cara a lo tuyo perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Acoso, troleyo u intolerancia" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tiens problemas?" +msgstr "Tiens problemas?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Amagar la publicación pa yo" @@ -4984,17 +4677,9 @@ msgstr "Si yes un desenrollador/a, puez alochar lo tuyo propio servidor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si yes mirando de cambiar lo tuyo identificador u correu electronico, fe-lo antes de desactivar la tuya cuenta." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal y urchent" +msgstr "Si yes mirando de cambiar lo tuyo identificador u correu electronico, fe-lo antes de desactivar la tuya cuenta.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imachen" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Suplantación d'identidat u afirmacions falsas sobre identidat u afiliación" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Suplantación d'identidat, desinformación u afirmacions falsas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mensaches inadecuaus u vinclos explicitos" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Escribe la clau pa la eliminación d'a cuenta" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Escribe lo codigo que se t'ha ninviau per correu electronico" +msgstr "Escribe lo codigo que se t'ha ninviau per correu electronico<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interacción limitada" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Nomás yes tu per agora! Anyade mas personas a lo tuyo paquet d'inicio buscando alto." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID de fayena: {0}" @@ -5231,17 +4887,13 @@ msgstr "Etiquetado per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetau per l'autor." +msgstr "Etiquetau per l'autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquetas" @@ -5306,17 +4958,9 @@ msgstr "Aprender-ne mas" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Aprender mas de Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Obtiene mas información sobre cómo autoalochar la tuya PDS." @@ -5351,15 +4995,10 @@ msgstr "Mas información sobre lo que ye publico en Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Aprender-ne mas." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Me fa goyo" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Me fa goyo ({0, plural, one {# me-fa-goyo} other {# me-fa-goyos}})" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Me fa goyo en esta publicación" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaches" +msgstr "Mensaches<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cuenta enganyosa" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publicación enganyosa" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Ferramientas de moderación" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Lo moderador ha decidiu d'establir una advertencia cheneral sobre lo conteniu." +msgstr "Lo moderador ha decidiu d'establir una advertencia cheneral sobre lo conteniu.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mas canals" @@ -6047,18 +5652,8 @@ msgstr "Los mías canals" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nombre" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nombre u descripción que violan los estándard d'a comunidat" - -======= ->>>>>>> upstream/main +msgstr "Nombre<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Encara sini \"me-fa-goyos\"" +msgstr "Encara sini \"me-fa-goyos\"<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ya no sigues a {0}" @@ -6283,7 +5873,7 @@ msgstr "No i hai mensaches encara" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Encara no i hai notificacions!" @@ -6337,9 +5927,9 @@ msgstr "No s'ha trobau resultaus" msgid "No results found for \"{query}\"" msgstr "No s'ha trobau resultaus pa \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "No s'ha trobau resultaus pa {query}" @@ -6474,15 +6064,8 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudez" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Desnudez u conteniu pa adultos no etiquetau como tal" +msgstr "Desnudez<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "D'acuerdo" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Ye bien" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Ubrir lo menú lateral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Ubrir selector d'emoji" @@ -6708,7 +6287,7 @@ msgstr "Ubrir compositor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Ubre lo selector d'emojis" @@ -6748,15 +6327,10 @@ msgstr "Ubre lo formulario de restablimiento de clau" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Ubre este perfil" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Unatro" @@ -6905,23 +6474,16 @@ msgstr "Personas seguindo a @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar-lo tot" @@ -7206,19 +6768,12 @@ msgstr "Publicación eliminada" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "No s'ha puesto cargar la publicación. Compreba la connexión a internet y torna-lo a intentar." +msgstr "No s'ha puesto cargar la publicación. Compreba la connexión a internet y torna-lo a intentar.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "La publicación ye estada eliminada" @@ -7354,7 +6909,7 @@ msgstr "Politica de privacidat" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Procesando video..." @@ -7382,19 +6937,12 @@ msgstr "Perfil actualizau" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Publico" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listas publicas y compartibles que se pueden fer servir pa chenerar canals." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas" +msgstr "Citas<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citas d'esta publicación" @@ -7553,12 +7097,12 @@ msgstr "Leyer los Termins y Condicions de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Eliminar l'adchunto" msgid "Remove Avatar" msgstr "Eliminar l'avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Eliminar lo banner" @@ -7824,17 +7368,13 @@ msgstr "Respuestas deshabilitadas" msgid "Replies to this post are disabled." msgstr "Las respuestas en esta publicación son deshabilitadas." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Responder ({0, plural, one {# respuesta} other {# respuestas}})" @@ -7995,13 +7535,9 @@ msgstr "Tornau a publicar per tu" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicacions d'esta publicación" @@ -8074,17 +7610,13 @@ msgstr "Restablir l'estau d'incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablir clau" +msgstr "Restablir clau<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Torna a intentar iniciar sesión" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia" +msgstr "Ciencia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Buscar \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Buscar \"{searchText}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Buscar GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Establir aniversario" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establir la clau nueva" +msgstr "Establir la clau nueva<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configura la tuya cuenta" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Amostrar respuestas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amostrar las respuestas como" +msgstr "Amostrar las respuestas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Amostrar respuesta pa toz" @@ -8910,13 +8423,9 @@ msgstr "Amostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Amostrar advertencia y filtrar d'as canals" +msgstr "Amostrar advertencia y filtrar d'as canals<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Amuestra información sobre cuán se va crear esta publicación" @@ -8937,7 +8446,7 @@ msgstr "Amuestra lo conteniu" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Fuent:<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Vasuera" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; mencions u respuestas excesivas" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Sucheriu pa tu" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suchestivo" +msgstr "Suchestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Condicions" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Condicions de servicio" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Los termins utilizaus violan las normas d'a comunidat" - -======= ->>>>>>> upstream/main +msgstr "Condicions de servicio<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto y etiquetas" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "Ixo ye tot!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "La cuenta podrá interactuar con tu dimpués de desblocar-la." @@ -9646,17 +9115,12 @@ msgstr "I ha habiu un problema en contactar con o servidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "I ha habiu un problema en contactar con o servidor, compreba la tuya connexión y torna-lo a intentar." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "I ha habiu un problema en obtener las notificacions. Toca aquí pa intentar de nuevo." +msgstr "I ha habiu un problema en obtener las notificacions. Toca aquí pa intentar de nuevo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "I ha habiu un problema en obtener las publicacions. Toca aquí pa intentar de nuevo." @@ -9695,16 +9159,9 @@ msgstr "I ha habiu un problema en actualizar las tuyas canals, compreba la tuya #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "I ha habiu un problema inasperau en l'aplicación. Per favor, grita-nos #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "I hai habiu una tongada de nuevos usuarios en Bluesky! Activaremos la tuya cuenta malas que podamos." +msgstr "I hai habiu una tongada de nuevos usuarios en Bluesky! Activaremos la tuya cuenta malas que podamos.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Esta lista ye vueda." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Este servicio de moderación no ye disponible. Consulta mas detalles contino. Si lo problema persiste, contacta-nos." +msgstr "Este servicio de moderación no ye disponible. Consulta mas detalles contino. Si lo problema persiste, contacta-nos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Esta publicación diz haber estau creada lo <0>{0}, pero la hemos vista en Bluesky lo <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Tema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducir" @@ -10203,22 +9644,13 @@ msgstr "Desblocar" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desblocar cuenta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Desblocar cuenta?" @@ -10240,16 +9672,8 @@ msgstr "Desfer republicación" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Desfer la republicación ({0, plural, one {# republicación} other {# republicaciones}})" +msgstr "Desfer la republicación ({0, plural, one {# republicación} other {# republicaciones}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Deixar de seguir" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Deixar de seguir a {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Ya no me fa goyo" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Ya no me fa goyo ({0, plural, one {# me-fa-goyo} other {# me-fa-goyos}})" @@ -10407,16 +9823,8 @@ msgstr "Dau de baixa d'a lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Conteniu sexual no deseyau" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Carga un fichero de texto en:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Puyar dende la camera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Puyar dende los tuyos fichers" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Puyar dende la biblioteca" @@ -10492,7 +9900,7 @@ msgstr "Cargando imáchens..." msgid "Uploading link thumbnail..." msgstr "Cargando thumbnail d'o vinclo..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Cargando video..." @@ -10746,7 +10154,7 @@ msgstr "Video no trobau." msgid "Video settings" msgstr "Configuración d'o video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video cargau" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Veyer l'avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Veyer la dentrada d'o blog pa mas detalles" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Veyer dentrada de depuración" +msgstr "Veyer dentrada de depuración<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Veyer detalles" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Veyer perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Veyer l'avatar" @@ -10888,15 +10291,10 @@ msgstr "Veyer las tuyas cuentas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Veyer la imachen completa" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Vai, no hemos puesto resolver esta lista. Si esto persiste, per favor co msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Vai, pero no hemos puesto cargar las tuyas parolas silenciadas en este momento. Per favor, intenta de nuevo." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Vai, no s'ha puesto completar la tuya busqueda. Torna-lo a intentar uns minutos." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Per qué creyes que este usuario ha d'estar revisau?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/ast/messages.po b/src/locale/locales/ast/messages.po index 9cb45ccd2..dfed53377 100644 --- a/src/locale/locales/ast/messages.po +++ b/src/locale/locales/ast/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {siguidor} other {siguidores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {préstame} other {préstames}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publicación} other {publicaciones}}" +msgstr "{0, plural, one {publicación} other {publicaciones}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {cita} other {cites}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republicación} other {republicaciones}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {cita} other {cites}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republicación} other {republicaciones}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date}, {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Accesibilidá" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Configuración d'accesibilidá" +msgstr "Configuración d'accesibilidá<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta" +msgstr "Cuenta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "" @@ -661,26 +634,18 @@ msgstr "" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Quitóse la cuenta del accesu rápidu" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "" @@ -770,7 +735,7 @@ msgstr "Amestar otra cuenta" msgid "Add another post" msgstr "Amestar otra publicación" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Conteníu p'adultos" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema que nun s'inclúi nestes opciones" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamientu antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Los nomes de les contraseñes d'aplicación han tener polo menos 4 cará #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Contraseñes d'aplicación" +msgstr "Contraseñes d'aplicación<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Contraseñes d'aplicación" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apellar esta decisión" +msgstr "Apellar esta decisión<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aspeutu" @@ -1307,23 +1242,14 @@ msgstr "" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Archivóse la publicación" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversariu" +msgstr "Aniversariu<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquiar la cuenta" @@ -1546,15 +1446,8 @@ msgstr "Bloquiar les cuentes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloquiar la llista" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloquióse" @@ -1617,40 +1506,18 @@ msgstr "El bloquéu ye públicu. Les cuentes bloquiaes nun puen responder nos to #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "El bloquéu nun impide que les etiquetes s'apliquen a la to cuenta, mas nun va dexar qu'esta cuenta respuenda a los tos filos o interactúe contigo." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky nun pue verificar l'autenticidá de la data indicada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blogue" +msgstr "El bloquéu nun impide que les etiquetes s'apliquen a la to cuenta, mas nun va dexar qu'esta cuenta respuenda a los tos filos o interactúe contigo.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky nun pue verificar l'autenticidá de la data indicada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky ye una rede abierta onde pues escoyer l'agospiador. Si yes desendolcador, pues agospiar un sirvidor." @@ -1702,13 +1569,9 @@ msgstr "Llibros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Restolar más cuentes na páxina «Esploración»" @@ -1819,19 +1682,13 @@ msgstr "Cámara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Nun se pue interactuar con un usuariu bloquiáu" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Tocotó 🐴 tocotó 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimiendo'l videu…" @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar el códigu" +msgstr "Copiar el códigu<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar el DID" @@ -2705,7 +2538,7 @@ msgstr "Creación d'una cuenta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "" @@ -2766,15 +2599,8 @@ msgstr "Personalizáu" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personaliza quién pue interactuar con esta publicación." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Escuru" @@ -2834,17 +2653,13 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "La predeterminada" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactivar la rempuesta háptica" +msgstr "Desactivar la rempuesta háptica<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Descubri feeds nuevos" msgid "Dismiss" msgstr "" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Escartar l'error" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Baxar el ficheru CAR" +msgstr "Baxar el ficheru CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar l'avatar" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Prodúxose un error mentanto se guardaba'l ficheru" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Tol mundu" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menciones o rempuestes escesives" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensaxes escesivos o non deseaos" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4164,26 +3946,8 @@ msgstr "" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "" +msgstr "<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4194,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Siguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Siguir" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Siguir tamién" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Siguir tamién" @@ -4295,13 +4042,9 @@ msgstr "Siguidores que conoces" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Siguiendo" @@ -4309,16 +4052,11 @@ msgstr "Siguiendo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Siguiendo" +msgstr "Siguiendo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "" @@ -4405,15 +4143,8 @@ msgstr "¿Escaeciéstila?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publica conteníu non deseáu frecuentemente" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Pon cara al perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Incumplimientos evidentes de la llei o de los términos del serviciu" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Pon cara al perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Función háptica" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Acosu, troléu o intolerancia" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "¿Tienes dalgún problema?" +msgstr "¿Tienes dalgún problema?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Escondeme la publicación" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si tentes de camudar l'identificador o la direición de corréu, failo enantes de desactivar la cuenta." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegal y urxente" +msgstr "Si tentes de camudar l'identificador o la direición de corréu, failo enantes de desactivar la cuenta.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imaxe" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Suplantación d'identidá o afirmaciones falses tocante a la identidá o afiliación" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Suplantación d'identidá, desinformación o afirmaciones falses" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Enllaces esplícitos o mensaxes que nun son afayadizos" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Llendóse la interaición" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "¡Namás tas tu! Amiesta más persones al paquete d'iniciación buscando arriba." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID de trabayu: {0}" @@ -5231,17 +4887,13 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquetes" @@ -5306,17 +4958,9 @@ msgstr "" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Saber más tocante a Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "" @@ -5351,15 +4995,10 @@ msgstr "Saber más tocante a qué ye público en Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Saber más." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Dar préstame" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Préstames d'esta publicación" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaxes" +msgstr "Mensaxes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cuenta engañosa" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publicación engañosa" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Ferramientes de moderación" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Más feeds" @@ -6047,18 +5652,8 @@ msgstr "Los mios feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "El nome o la descripción incumplen los estándares de la comunidá" - -======= ->>>>>>> upstream/main +msgstr "Nome<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Nun hai nengún préstame" +msgstr "Nun hai nengún préstame<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Yá nun sigues a {0}" @@ -6283,7 +5873,7 @@ msgstr "Nun hai nengún mensaxe" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "¡Nun hai nengún avisu!" @@ -6337,9 +5927,9 @@ msgstr "Nun s'atopó nengún resultáu" msgid "No results found for \"{query}\"" msgstr "Nun s'atopó nengún resultáu pa: {query}" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Nun s'atopó nengún resultáu pa: {query}" @@ -6474,15 +6064,8 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudos" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Desnudos o conteníu p'adultos que nun s'etiquetó como tal" +msgstr "Desnudos<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "D'acuerdu" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Abrir el selector de fustaxes" @@ -6708,7 +6287,7 @@ msgstr "Abre'l compositor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Abre esti perfil" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Otru tipu" @@ -6905,23 +6474,16 @@ msgstr "Persones que siguen a @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar too" @@ -7206,19 +6768,12 @@ msgstr "" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "La xuba de la publicación falló. Comprueba la conexón a internet y volvi tentalo." +msgstr "La xuba de la publicación falló. Comprueba la conexón a internet y volvi tentalo.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "Política de privacidá" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Procesando'l videu…" @@ -7382,19 +6937,12 @@ msgstr "Anovóse'l perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Públicu" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Desactiváronse les cites" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Cites" +msgstr "Cites<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Cites d'esta publicación" @@ -7553,12 +7097,12 @@ msgstr "" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "" msgid "Remove Avatar" msgstr "Quitar l'avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "" @@ -7824,17 +7368,13 @@ msgstr "" msgid "Replies to this post are disabled." msgstr "" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "Republiquesti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicaciones d'esta publicación" @@ -8074,17 +7610,13 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia" +msgstr "Ciencia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Buscar «{query}»" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Amosar les rempuestes" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amosar les rempuestes como" +msgstr "Amosar les rempuestes como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "" @@ -8910,13 +8423,9 @@ msgstr "" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,23 +8653,11 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -======= ->>>>>>> upstream/main msgstr "" #: src/lib/interests.ts:72 @@ -9316,23 +8813,9 @@ msgstr "Suxerencies pa ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suxerente" +msgstr "Suxerente<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Términos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Términos del serviciu" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Los terminos usaos incumplen los estándares de la comunidá" - -======= ->>>>>>> upstream/main +msgstr "Términos del serviciu<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Testu y etiquetes" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "La cuenta va ser a interactuar contigo dempués de desbloquiala." @@ -9646,17 +9115,12 @@ msgstr "Hebo un problema al conectase col sirvidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Hebo un problema al conectase col sirvidor. Comprueba la conexón a internet y volvi tentalo." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Hebo un problema al catar los avisos. Toca equí pa volver tentalo." +msgstr "Hebo un problema al catar los avisos. Toca equí pa volver tentalo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Hebo un problema al catar les publicaciones. Toca equí pa volver tentalo." @@ -9695,16 +9159,9 @@ msgstr "Hebo un error al anovar los feeds. Comprueba la conexón a internet y vo #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "Hebo un problema inesperáu na aplicación. ¡Coméntanos si te pasó!" #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "¡Hebo una cantidá escomanada d'usuarios nuevos en Bluesky! Vamos activar la cuenta namás que podamos." +msgstr "¡Hebo una cantidá escomanada d'usuarios nuevos en Bluesky! Vamos activar la cuenta namás que podamos.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Esta llista ta balera." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Esti serviciu de moderación nun ta disponible. Consulta abaxo los detalles y si sigue'l problema, ponte en contautu con nós." +msgstr "Esti serviciu de moderación nun ta disponible. Consulta abaxo los detalles y si sigue'l problema, ponte en contautu con nós.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Indicóse qu'esta publicación se creó'l <0>{0} mas la primer vegada que se creó en Bluesky foi'l <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Tema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducir" @@ -10203,22 +9644,13 @@ msgstr "" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloquiar la cuenta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "¿Quies desbloquiar la cuenta?" @@ -10240,16 +9672,8 @@ msgstr "Desfacer la republicación" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Dexar de siguir" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "Diéstite de baxa d'esta llista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Conteníu sexual non deseáu" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Xubi un ficheru de testu a:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Xubir dende Cámara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Xubir dende Ficheros" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Xubir dende Biblioteca" @@ -10492,7 +9900,7 @@ msgstr "Xubiendo les imáxenes…" msgid "Uploading link thumbnail..." msgstr "Xubiendo la miniatura del enllaz…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Xubiendo'l videu…" @@ -10746,7 +10154,7 @@ msgstr "Nun s'atopó'l videu." msgid "Video settings" msgstr "" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Xubióse'l videu" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ver l'avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Ver la entrada del blogue pa consultar los detalles" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver la entrada de depuración" +msgstr "Ver la entrada de depuración<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ver los detalles" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Ver el perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "" @@ -10888,15 +10291,10 @@ msgstr "" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Nun fuimos a resolver esta llista. Si sigue'l problema, ponte en contaut msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Nesti momentu nun fuimos a cargar la llista de pallabres silenciaes. Volvi tentalo." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "La busca nun se completó. Volvi tentalo nunos minutos." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "¿Por qué habría revisase esti usuariu?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/ca/messages.po b/src/locale/locales/ca/messages.po index d0ca22a39..089afba0a 100644 --- a/src/locale/locales/ca/messages.po +++ b/src/locale/locales/ca/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidors}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seguint} other {seguint}}" +msgstr "{0, plural, one {seguint} other {seguint}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {m'agrada} other {m'agrades}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publicació} other {publicacions}}" +msgstr "{0, plural, one {publicació} other {publicacions}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citació} other {citacions}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republicació} other {republicacions}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citació} other {citacions}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republicació} other {republicacions}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {desada} other {desades}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, one {}other {+# més}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Compte)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} a les {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Inicia la sessió<1> o <2>crea un compte<3> <4>per cercar notícies, esports, política, jocs de paraules i tot el que passa a Bluesky." @@ -587,11 +567,7 @@ msgstr "Sobre" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportament abusiu o discriminatori" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Accessibilitat" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Configuració d'accessibilitat" +msgstr "Configuració d'accessibilitat<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Compte" +msgstr "Compte<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Compte bloquejat" @@ -669,26 +634,18 @@ msgstr "Compte silenciat per una llista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcions del compte" +msgstr "Opcions del compte<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Proveïdor de comptes" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Compte eliminat de l'accés ràpid" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Compte desbloquejat" @@ -778,7 +735,7 @@ msgstr "Afegeix un altre compte" msgid "Add another post" msgstr "Afegeix una altra publicació" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Afegeix una altra publicació al fil" @@ -889,20 +846,12 @@ msgstr "Adults" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contingut per a adults" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contingut per a adults" @@ -921,11 +870,7 @@ msgstr "Etiquetes de contingut per a adults" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contingut d'abús sexual per a adults" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Una il·lustració que mostra que Bluesky selecciona verificadors de confiança i, al seu torn, els verificadors de confiança verifiquen els comptes d'usuari individuals." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema que no està inclòs en aquestes opcions" @@ -1171,19 +1112,11 @@ msgstr "i" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Abús sexual animal" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Benestar animal" ->>>>>>> upstream/main +msgstr "Benestar animal>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Comunicat" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunciant la verificació a Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportament antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Anunciant la verificació a Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Qualsevol" ->>>>>>> upstream/main +msgstr "Qualsevol>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Els noms de contrasenyes d'aplicació han de tenir almenys 4 caràcters" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Contrasenyes de l'aplicació" +msgstr "Contrasenyes de l'aplicació<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Contrasenyes de l'aplicació" @@ -1307,19 +1225,12 @@ msgstr "Apel·la la suspensió" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apel·la aquesta decisió" +msgstr "Apel·la aquesta decisió<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aparença" @@ -1331,23 +1242,14 @@ msgstr "Aplica els canals recomanats per defecte" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplica la petició d'integració Pull Request" +msgstr "Aplica la petició d'integració Pull Request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arxivat del dia {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arxivat del dia {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publicació arxivada" @@ -1416,18 +1318,11 @@ msgstr "Assigna un tema per a l'algoritme" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Almenys 8 caràcters" +msgstr "Almenys 8 caràcters<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponible" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponible" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Torna als xats" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Activitats prohibides o infraccions de seguretat" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Usuari prohibit que torna" ->>>>>>> upstream/main +msgstr "Usuari prohibit que torna>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Comença el procés de garantia d'edat emplenant els següents camps." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversari" +msgstr "Aniversari<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloqueja" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloqueja el compte" @@ -1579,15 +1446,8 @@ msgstr "Bloqueja comptes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloqueja i elimina" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloqueja i/o elimina la conversa" +msgstr "Bloqueja i elimina<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloqueja una llista" @@ -1607,18 +1467,14 @@ msgstr "Bloqueja l'usuari" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloqueja l'usuari" +msgstr "Bloqueja l'usuari<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Bloqueja l'usuari i/o elimina aquesta conversa" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloquejada" @@ -1650,40 +1506,18 @@ msgstr "El bloqueig és públic. Els comptes bloquejats no poden respondre els t #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Bloquejar no evitarà que s'apliquin etiquetes al teu compte, però no deixarà que aquest compte respongui els teus fils ni interactuï amb tu." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky no pot confirmar l'autenticitat de la data declarada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Bloquejar no evitarà que s'apliquin etiquetes al teu compte, però no deixarà que aquest compte respongui els teus fils ni interactuï amb tu.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky no pot confirmar l'autenticitat de la data declarada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky és una xarxa oberta on pots escollir el teu proveïdor d'allotjament. Si ets un desenvolupador pots allotjar el teu propi servidor." @@ -1735,15 +1569,9 @@ msgstr "Llibres" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Incompliment de les normes del lloc" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Explora més comptes a la pàgina Explora" @@ -1854,19 +1682,13 @@ msgstr "Càmera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Cancel·la la reactivació i surt" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancel·la la cerca" +msgstr "Cancel·la la cerca<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "No pots interactuar amb un usuari bloquejat" @@ -1955,11 +1771,7 @@ msgstr "Diàleg de canvi de contrasenya" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Canvia la categoria de l'informe" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Sol·licituds de xat" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Comprova el teu correu per a rebre el codi de confirmació i entra'l aqu #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Seguretat infantil" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Material d'abús sexual infantil (CSAM)" ->>>>>>> upstream/main +msgstr "Material d'abús sexual infantil (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clop 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Tanca la finestra emergent de benvinguda" msgid "Closes password update alert" msgstr "Tanca l'alerta d'actualització de contrasenya" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Tanca l'editor de la publicació i descarta l'esborrany" @@ -2350,7 +2142,7 @@ msgstr "Crear publicacions de fins a {0, plural, one {}other {# caràcters}} de msgid "Compose reply" msgstr "Redacta una resposta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimint el vídeo..." @@ -2472,11 +2264,7 @@ msgstr "Contingut no disponible" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contingut que promou o representa l'autolesió" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copia DID de l'autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copia el codi" +msgstr "Copia el codi<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copia DID" @@ -2756,7 +2538,7 @@ msgstr "Crea un compte" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crea un compte" @@ -2817,35 +2599,16 @@ msgstr "Personalitzat" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opcions de personalització" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalitza qui pot interactuar amb aquesta publicació." +msgstr "Opcions de personalització<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personalitza la teva experiència a Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Reptes o activitats perilloses" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Substàncies perilloses o abús de drogues" @@ -2854,7 +2617,6 @@ msgstr "Substàncies perilloses o abús de drogues" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Fosc" @@ -2891,19 +2653,13 @@ msgstr "Panell de depuració" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Contingut per a adults deepfake" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Per defecte" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Icones per defecte" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Desactiva el correu 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactiva la retroalimentació hàptica" +msgstr "Desactiva la retroalimentació hàptica<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Desactiva del tot les respostes>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Desactiva del tot les respostes" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Descobreix nous canals" msgid "Dismiss" msgstr "Descarta" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Descarta l'error" @@ -3271,11 +3014,8 @@ msgstr "No pateixis! Tots els missatges i la configuració existents es desen i #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Descarrega Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Descarrega el fitxer CAR" +msgstr "Descarrega el fitxer CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Comportament depredador o de manipulació grooming" ->>>>>>> upstream/main +msgstr "Comportament depredador o de manipulació grooming>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "p. ex. Usuaris que sempre responen amb anuncis." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trastorns alimentaris" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Edita" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Edita l'avatar" @@ -3693,7 +3423,7 @@ msgstr "Canvia a pantalla completa" msgid "Entertainment" msgstr "Entreteniment" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3714,11 +3444,11 @@ msgstr "Missatge d'error" msgid "Error occurred while saving file" msgstr "Ha ocorregut un error en desar el fitxer" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error en rebre la resposta al captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Error: {error}" @@ -3740,19 +3470,8 @@ msgstr "Tothom" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tota la resta" +msgstr "Tota la resta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mencions o respostes excessives" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Missatges excessius o no desitjats" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Exclou els usuaris que segueixes" @@ -3876,11 +3595,7 @@ msgstr "Preferència del contingut extern" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contingut extremista" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "No s'ha pogut verificar l'identificador. Torna-ho a provar." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "Compte fals o bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Informació falsa sobre les eleccions" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Canal" @@ -4241,26 +3946,8 @@ msgstr "Finalitza" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Exercici" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Negre pla" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Blau pla" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Blanc pla" +msgstr "Exercici<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4271,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Segueix" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Segueix" @@ -4323,16 +4001,8 @@ msgstr "Segueix tots els comptes" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Segueix" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Segueix" @@ -4372,13 +4042,9 @@ msgstr "Seguidors que coneixes" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seguint" @@ -4386,16 +4052,11 @@ msgstr "Seguint" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguint" +msgstr "Seguint<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Seguint {0}" @@ -4482,15 +4143,8 @@ msgstr "Oblidada?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Allibera el teu canal" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publica contingut no desitjat freqüentment" +msgstr "Allibera el teu canal<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Posa una cara al teu perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Infraccions flagrants de la llei o les condicions del servei" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorificació de la violència" ->>>>>>> upstream/main +msgstr "Posa una cara al teu perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Mitjans gràfics" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Contingut gràficament violent" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Comportament depredador o de manipulació grooming" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking o atacs al sistema" ->>>>>>> upstream/main +msgstr "Hacking o atacs al sistema>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Hàptics" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Assetjament, troleig o intolerància" -======= -msgstr "Assetjament o odi" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Activitats nocives o d'alt risc" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Perjudicar o posar en perill els menors" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Etiqueta: {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Discurs d'odi" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Tens un codi?<0>Clica aquí." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tens problemes?" +msgstr "Tens problemes?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Amaga les opcions de personalització" +msgstr "Amaga les opcions de personalització<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Amaga les llistes" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Amaga'm aquesta publicació" @@ -5015,11 +4613,7 @@ msgstr "Com hem d'obrir aquest enllaç?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tràfic de persones" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Si ets desenvolupador, pots allotjar el teu propi servidor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si vols canviar el teu identificador o el correu fes-ho abans de desactivar el compte." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Il·legal i urgent" +msgstr "Si vols canviar el teu identificador o el correu fes-ho abans de desactivar el compte.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imatge" @@ -5113,29 +4699,15 @@ msgstr "Imatge desada" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Les imatges no es poden desar si no es concedeix permís per a accedir a la biblioteca de fotos." +msgstr "Les imatges no es poden desar si no es concedeix permís per a accedir a la biblioteca de fotos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Suplantació d'identitat o afirmacions falses sobre identitat o afiliació" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Suplantació d'identitat, desinformació o afirmacions falses" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Suplantació d'identitat" ->>>>>>> upstream/main +msgstr "Suplantació d'identitat>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Integrades a l'aplicació, push, tothom" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Integrades a l'aplicació, push, gent a qui segueixes" +msgstr "Integrades a l'aplicació, push, gent a qui segueixes<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Missatges inapropiats o enllaços explícits" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Introdueix la contrasenya per a eliminar el compte" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Introdueix el codi que has rebut per correu" +msgstr "Introdueix el codi que has rebut per correu<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interacció limitada" @@ -5287,7 +4844,7 @@ msgstr "Només hi ha <0>{0} ara mateix! Afegeix més persones al teu starte msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Ara només ets tu! Afegeix més persones al teu starter pack cercant a dalt." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Identificador de la tasca: {0}" @@ -5330,17 +4887,13 @@ msgstr "Etiquetat per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetat per l'autor." +msgstr "Etiquetat per l'autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquetes" @@ -5405,17 +4958,9 @@ msgstr "Més informació" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Més informació sobre la garantia d'edat" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Més informació sobre Bluesky" +msgstr "Més informació sobre la garantia d'edat<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Més informació sobre com allotjament el teu PDS." @@ -5450,15 +4995,10 @@ msgstr "Més informació sobre què és públic a Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Més informació a la <0>configuració del compte." +msgstr "Més informació a la <0>configuració del compte.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Més informació." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "M'agrada" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "M'agrada ({0, plural, one {# m'agrada} other {# m'agrades}})" @@ -5589,13 +5125,9 @@ msgstr "M'agrades de les teves republicacions" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificacions de m'agrades de les teves republicacions" +msgstr "Notificacions de m'agrades de les teves republicacions<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "M'agrades a aquesta publicació" @@ -5899,49 +5431,24 @@ msgstr "Opcions del missatge" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Missatges" +msgstr "Missatges<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Mitjanit" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Assetjament o intimidació lleu" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notificacions diverses" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Compte enganyós" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publicació enganyosa" -======= -msgstr "Enganyós" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Eines de moderació" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "El moderador ha decidit establir un advertiment general sobre el contingut." +msgstr "El moderador ha decidit establir un advertiment general sobre el contingut.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Més canals" @@ -6150,18 +5652,8 @@ msgstr "Els meus canals" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nom" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "El nom o la descripció infringeixen els estàndards comunitaris" - -======= ->>>>>>> upstream/main +msgstr "Nom<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Sense imatge" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Encara no té cap m'agrada" +msgstr "Encara no té cap m'agrada<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ja no segueixes a {0}" @@ -6386,7 +5873,7 @@ msgstr "Encara no tens cap missatge" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "S'han acabat els algoritmes plens de brossa i que t'enganxen en una espiral de notícies negatives. Troba canals que funcionin per a tu, no en contra teva." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Encara no tens cap notificació" @@ -6440,9 +5927,9 @@ msgstr "No s'han trobat resultats" msgid "No results found for \"{query}\"" msgstr "No s'han trobat resultats per \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "No s'han trobat resultats per {query}" @@ -6482,11 +5969,7 @@ msgstr "No s'ha trobat ningú. Intenta cercar algú altre." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Imatges íntimes no consentides" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Ara" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuesa" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nuesa o contingut per a adults no etiquetat com a tal" +msgstr "Nuesa<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "D'acord" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "D'acord" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Obre el menú del calaix" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Obre el selector d'emojis" @@ -6815,7 +6287,7 @@ msgstr "Obre el compositor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Obre la galeria del dispositiu per seleccionar fins a {MAX_IMAGES, plural, other{# imatges}} o un sol vídeo o GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Obre el selector d'emojis" @@ -6855,15 +6327,10 @@ msgstr "Obre el formulari de restabliment de la contrasenya" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Obre la configuració d'idioma de la publicació" +msgstr "Obre la configuració d'idioma de la publicació<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Obre aquest perfil" @@ -6897,12 +6364,7 @@ msgstr "Estat de l'OTA: Cap disponible" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Un altre" @@ -6912,35 +6374,8 @@ msgstr "Un altre compte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Altres problemes de seguretat infantil" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Altres continguts perillosos" @@ -6963,8 +6398,7 @@ msgstr "Altres continguts de violència sexual" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Altres continguts violents" ->>>>>>> upstream/main +msgstr "Altres continguts violents>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Persones seguint a @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Gent que segueixo" +msgstr "Gent que segueixo<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Persones que segueixes" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Persones que menciones" +msgstr "Persones que menciones>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "S'ha denegat el permís per accedir a la teva biblioteca de fotos. Si us plau, activa-ho a la configuració del sistema." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publica" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publica" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publica-ho tot" @@ -7341,19 +6768,12 @@ msgstr "Publicació eliminada" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "No s'ha pogut penjar la publicació. Comprova la tevaa connexió a Internet i torna-ho a provar." +msgstr "No s'ha pogut penjar la publicació. Comprova la tevaa connexió a Internet i torna-ho a provar.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "La publicació s'ha eliminat" @@ -7487,13 +6907,9 @@ msgstr "Política de privacitat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Violació de la privadesa d'un menor" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Processant el vídeo..." @@ -7521,15 +6937,11 @@ msgstr "Perfil actualitzat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promoció o venda d'articles o serveis prohibits" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! Pots editar qui pot interactuar amb aquesta publicació." ->>>>>>> upstream/main +msgstr "Psst! Pots editar qui pot interactuar amb aquesta publicació.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Llistes públiques i compartibles que es poden utilitzar per generar feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publica la publicació" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publica les publicacions" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publica les respostes" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publica la resposta" @@ -7622,13 +7034,9 @@ msgstr "S'han deshabilitat les citacions" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citacions" +msgstr "Citacions<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citacions d'aquesta publicació" @@ -7689,12 +7097,12 @@ msgstr "Llegeix els termes de servei de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Elimina l'adjunt" msgid "Remove Avatar" msgstr "Elimina l'avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Elimina el bàner" @@ -7960,17 +7368,13 @@ msgstr "Respostes deshabilitades" msgid "Replies to this post are disabled." msgstr "Les respostes a aquesta publicació estan deshabilitades." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Respon" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Respostes ({0, plural, one {# resposta} other {# respostes}})" @@ -8060,11 +7464,7 @@ msgstr "S'ha enviat la denúncia" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Informa sobre aquesta conversa" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Republicat per tu" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicacions" +msgstr "Republicacions<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicacions d'aquesta publicació" @@ -8214,17 +7610,13 @@ msgstr "Restableix l'estat de la incorporació" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restableix la contrasenya" +msgstr "Restableix la contrasenya<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Torna a intentar iniciar sessió" @@ -8377,28 +7769,21 @@ msgstr "Digues hola!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Estafa" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciència" +msgstr "Ciència<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Desplaça't a l'esquerra" @@ -8443,11 +7828,11 @@ msgstr "Cerca per \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Cerca per \"{interestsDisplayName}\"(activa)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Cerca per \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Cerca per \"{searchText}\"" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Cerca GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "La cerca no està disponible actualment amb la sessió tancada" @@ -8565,11 +7950,7 @@ msgstr "Selecciona un color" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tria un motiu" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "No es permet seleccionar diversos tipus de suports." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Autolesions o comportaments perillosos" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Estableix la data de naixement" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Estableix una nova contrasenya" +msgstr "Estableix una nova contrasenya<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Defineix amb precisió quins grups de persones poden respondre a la teva publicació" +msgstr "Defineix amb precisió quins grups de persones poden respondre a la teva publicació>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configura el teu compte" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Mostra les respostes" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostra les respostes com a" +msgstr "Mostra les respostes com a<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostra la resposta a tothom" @@ -9062,13 +8423,9 @@ msgstr "Mostra l'advertiment" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostra l'advertiment i filtra-ho dels canals" +msgstr "Mostra l'advertiment i filtra-ho dels canals<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Mostra informació sobre quan es va crear aquesta publicació" @@ -9089,7 +8446,7 @@ msgstr "Mostra el contingut" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Font:<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Brossa" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Brossa; excessives mencions o respostes" -======= -msgstr "Correu brossa o altres comportaments no autèntics o enganys" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Suggeriments per tu" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggerent" +msgstr "Suggerent<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Alba" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Ocàs" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Toca per a ignorar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Assetjament dirigit" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Condicions" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Condicions del servei" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Els termes utilitzats infringeixen els estàndards de la comunitat" - -======= ->>>>>>> upstream/main +msgstr "Condicions del servei<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Text i etiquetes" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "Això és tot!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "El compte podrà interactuar amb tu després del desbloqueig." @@ -9803,17 +9115,12 @@ msgstr "Hi ha hagut un problema per a contactar amb el servidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "S'ha produït un problema en contactar amb el servidor, comprova la teva connexió a Internet i torna-ho a provar." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Hi ha hagut un problema en obtenir les notificacions. Toca aquí per a tornar-ho a provar." +msgstr "Hi ha hagut un problema en obtenir les notificacions. Toca aquí per a tornar-ho a provar.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Hi ha hagut un problema en obtenir les notificacions. Toca aquí per a tornar-ho a provar." @@ -9852,16 +9159,9 @@ msgstr "S'ha produït un problema actualitzant els teus canals. Comprova la teva #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "S'ha produït un problema inesperat a l'aplicació. Fes-nos saber si aix #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Hi ha hagut una gran quantitat d'usuaris nous a Bluesky! Activarem el teu compte tan aviat com puguem." +msgstr "Hi ha hagut una gran quantitat d'usuaris nous a Bluesky! Activarem el teu compte tan aviat com puguem.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Aquesta és la teva configuració predeterminada" ->>>>>>> upstream/main +msgstr "Aquesta és la teva configuració predeterminada>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Aquesta llista està buida." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Aquest servei de moderació no està disponible. Mira a continuació per a obtenir més detalls. Si aquest problema persisteix, posa't en contacte amb nosaltres." +msgstr "Aquest servei de moderació no està disponible. Mira a continuació per a obtenir més detalls. Si aquest problema persisteix, posa't en contacte amb nosaltres.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Aquesta publicació afirma haver estat creada el <0>{0}, però va ser vista per primera vegada per Bluesky el <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Preferències dels fils de debat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Amenaces o incitació" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Tema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Tradueix" @@ -10262,11 +9541,7 @@ msgstr "Vídeos populars" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolejar" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Desbloqueja" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloqueja el compte" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Vols desbloquejar el compte?" @@ -10406,16 +9672,8 @@ msgstr "Desfés la republicació" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Desfés republicacions ({0, plural, one {# republicació} other {# republicacions}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Deixa de seguir" +msgstr "Desfés republicacions ({0, plural, one {# republicació} other {# republicacions}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Deixa de seguir a {0}" @@ -10443,32 +9701,18 @@ msgstr "Verificador desconegut" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Contingut per a adults sense etiquetar" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Contingut per a adults sense etiquetar, abusiu o no consentit" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Desfés el m'agrada" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Desfés els m'agrades ({0, plural, one {# m'agrada} other {# m'agrades}})" @@ -10579,16 +9823,8 @@ msgstr "T'has dona't de baixa de la llista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tipus de vídeo no compatible: {mimeType}" +msgstr "Tipus de vídeo no compatible: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contingut sexual no desitjat" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Puja un fitxer de text a:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Puja de la càmera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Puja dels Fitxers" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Puja de la biblioteca" @@ -10664,7 +9900,7 @@ msgstr "S'estan penjant imatges..." msgid "Uploading link thumbnail..." msgstr "S'està penjant la miniatura de l'enllaç..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "S'està penjant el vídeo..." @@ -10918,7 +10154,7 @@ msgstr "No s'ha trobat el vídeo." msgid "Video settings" msgstr "Configuració de vídeo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Vídeo penjat" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Veure" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Veure l'avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Veure l'entrada al blog per a més detalls" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Veure el registre de depuració" +msgstr "Veure el registre de depuració<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Veure els detalls" @@ -11013,10 +10248,6 @@ msgstr "Veure la publicació" msgid "View profile" msgstr "Veure el perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Veure l'avatar" @@ -11060,15 +10291,10 @@ msgstr "Veure els teus comptes silenciats" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Veure les teves verificacions" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Veure les teves verificacions<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Veure la imatge completa" @@ -11078,24 +10304,16 @@ msgstr "Veure el vídeo en el mode immersiu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Contingut violent o amenaçador>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violència" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Contingut violent o amenaçador" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Ho sentim, però no hem pogut resoldre aquesta llista. Si això continua msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Ho sentim, però no hem pogut carregar les teves paraules silenciades en aquest moment. Torna-ho a provar." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Ens sap greu, però la teva cerca no s'ha pogut fer. Prova-ho d'aquí una estona." @@ -11346,11 +10564,7 @@ msgstr "Per què vols apel·lar?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Per què s'hauria de revisar aquesta conversa?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Per què s'hauria de revisar aquest usuari?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Vols bloquejar aquest usuari i/o eliminar aquesta conversa?" ->>>>>>> upstream/main +msgstr "Vols bloquejar aquest usuari i/o eliminar aquesta conversa?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Has iniciat sessió amb una contrasenya d'aplicació. Inicia sessió amb #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Ja has apel·lat aquesta etiqueta i el nostre equip de moderació l'està revisant." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/cy/messages.po b/src/locale/locales/cy/messages.po index 001eb2261..1d917dc35 100644 --- a/src/locale/locales/cy/messages.po +++ b/src/locale/locales/cy/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {dilynwr} other {dilynwr}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {yn dilyn} other {yn dilyn}}" +msgstr "{0, plural, one {yn dilyn} other {yn dilyn}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {hoffi} other {hoffi}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {postiad} other {postiad}}" +msgstr "{0, plural, one {postiad} other {postiad}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {dyfyniad} other {dyfyniad}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {ail bostiad} other {ail bostiad}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {dyfyniad} other {dyfyniad}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {ail bostiad} other {ail bostiad}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, zero {}one {cadw} two {cadw} few {cadw} many {cadw} other {cadw}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, zero {} one {+# yn rhagor} two {+# yn rhagor} few {+# yn rha #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Cyfrif)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} am {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Mewngofnodwch<1> neu <2>grëwch cyfrif<3> <4>i chwilio am newyddion, chwaraeon, gwleidyddiaeth, a phopeth arall sy'n digwydd ar Bluesky." @@ -587,11 +567,7 @@ msgstr "Ynghylch" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ymddygiad bygythiol a gwahaniaethol eraill" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Hygyrchedd" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Gosodiadau Hygyrchedd" +msgstr "Gosodiadau Hygyrchedd<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cyfrif" +msgstr "Cyfrif<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Cyfrif wedi'i rwystro" @@ -669,26 +634,18 @@ msgstr "Cyfrif wedi'i Dewi gan y Rhestr" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Dewisiadau cyfrif" +msgstr "Dewisiadau cyfrif<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Cyfrif wedi'i dynnu o fynediad cyflym" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Cyfrif wedi'i ddadrwystro" @@ -778,7 +735,7 @@ msgstr "Ychwanegu cyfrif arall" msgid "Add another post" msgstr "Ychwanegu postiad arall" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Ychwanegu postiad arall i edefyn" @@ -889,20 +846,12 @@ msgstr "Oedolyn" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Cynnwys oedolion" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Cynnwys Oedolion" @@ -921,11 +870,7 @@ msgstr "Labeli Cynnwys Oedolion" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Cynnwys camdriniaeth rywiol oedolion" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Darlun yn dangos bod Bluesky yn dewis dilyswyr dibynadwy, a dilyswyr dibynadwy yn eu tro yn gwirio cyfrifon defnyddwyr unigol." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Mater nad yw wedi'i gynnwys yn yr opsiynau hyn" @@ -1171,19 +1112,11 @@ msgstr "a" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "" -======= -msgstr "Camdriniaeth rywiol anifeiliaid" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" -msgstr "Lles anifeiliaid" ->>>>>>> upstream/main +msgstr "Lles anifeiliaid>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Cyhoeddiad" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Mae dilysu nawr ar gael ar Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Ymddygiad Gwrthgymdeithasol" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Mae dilysu nawr ar gael ar Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Rhaid i enwau cyfrinair ap fod o leiaf 4 nod" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Cyfrineiriau apiau" +msgstr "Cyfrineiriau apiau<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Cyfrineiriau Apiau" @@ -1307,19 +1225,12 @@ msgstr "Apelio yn erbyn yr Atal" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelio'r penderfyniad hwn" +msgstr "Apelio'r penderfyniad hwn<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Gwedd" @@ -1331,23 +1242,14 @@ msgstr "Gosod y ffrydiau rhagosodedig sy'n cael eu hargymell" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Gosod Cais Tynnu" +msgstr "Gosod Cais Tynnu<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Wedi'i archifo o {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Wedi'i archifo o {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Post wedi'i archifo" @@ -1416,18 +1318,11 @@ msgstr "Neilltuo pwnc ar gyfer algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "O leiaf 8 nod" +msgstr "O leiaf 8 nod<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Ar gael" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Ar gael" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Nôl i Sgyrsiau" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Gweithgareddau wedi'u rhwystro neu droseddu diogelwch" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Defnyddiwr wedi'i wahardd yn dychwelyd" ->>>>>>> upstream/main +msgstr "Defnyddiwr wedi'i wahardd yn dychwelyd>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Cychwynnwch y broses sicrwydd oed drwy lanw'r meysydd isod." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Penblwydd" +msgstr "Penblwydd<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Rhwystro" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Rhwystro cyfrif" @@ -1579,15 +1446,8 @@ msgstr "Rhwystro cyfrifon" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Rhwystro a Dileu" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Rhwystro a/neu ddileu'r sgwrs hon" +msgstr "Rhwystro a Dileu<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Rhestr rhwystro" @@ -1607,18 +1467,14 @@ msgstr "Rhwystro defnyddiwr" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Rhwystro'r Defnyddiwr" +msgstr "Rhwystro'r Defnyddiwr<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Rhwystro'r defnyddiwr a/neu ddileu'r sgwrs hon" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Ddim ar gael" @@ -1650,40 +1506,18 @@ msgstr "Mae rhwystro'n beth cyhoeddus. Nid oes modd i gyfrifon sydd wedi'u rhwys #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Fydd rhwystro ddim yn atal labeli rhag cael eu gosod ar eich cyfrif, ond bydd yn atal y cyfrif hwn rhag ateb yn eich trywyddau neu ryngweithio â chi." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Dyw Bluesky ddim yn gallu cadarnhau dilysrwydd y dyddiad honedig." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Fydd rhwystro ddim yn atal labeli rhag cael eu gosod ar eich cyfrif, ond bydd yn atal y cyfrif hwn rhag ateb yn eich trywyddau neu ryngweithio â chi.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Dyw Bluesky ddim yn gallu cadarnhau dilysrwydd y dyddiad honedig." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic ™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Mae Bluesky yn rhwydwaith agored lle gallwch ddewis eich darparwr gwesteio. Os ydych chi'n ddatblygwr, gallwch chi gynnal eich gweinydd eich hun." @@ -1735,15 +1569,9 @@ msgstr "Llyfrau" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Torri rheolau gwefan" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Porwch ragor o gyfrifon ar y dudalen Archwilio" @@ -1854,19 +1682,13 @@ msgstr "Camera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Diddymu'r ailweithredu ac allgofnodi" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Diddymu'r chwilio" +msgstr "Diddymu'r chwilio<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Methu rhyngweithio â defnyddiwr sydd wedi'i rwystro" @@ -1955,11 +1771,7 @@ msgstr "Newid deialog cyfrinair" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Newid categori adrodd" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Ceisiadau am sgyrsiau" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Gwiriwch eich blwch derbyn am e-bost gyda'r cod cadarnhau i'w roi isod:" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Diogelwch plant" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Deunydd Camdriniaeth Rywiol Plant (CSAM)" ->>>>>>> upstream/main +msgstr "Deunydd Camdriniaeth Rywiol Plant (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Cau'r modal croeso" msgid "Closes password update alert" msgstr "Yn cau'r rhybudd diweddaru cyfrinair" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Yn cau cyfansoddwr postiad ac yn dileu postiad drafft" @@ -2350,7 +2142,7 @@ msgstr "Cyfansoddwch bostiadau hyd at {0, plural, zero {} one {# nod} two {# nod msgid "Compose reply" msgstr "Ysgrifennu ateb" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Yn cywasgu fideo..." @@ -2472,11 +2264,7 @@ msgstr "Dim Cynnwys ar Gael" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Cynnwys sy'n hyrwyddo neu'n dangos hunan niweidio" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copïo DID awdur" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copïo cod" +msgstr "Copïo cod<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copïo DID" @@ -2756,7 +2538,7 @@ msgstr "Creu Cyfrif" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Creu cyfrif" @@ -2817,35 +2599,16 @@ msgstr "Cyfaddas" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Dewisiadau cyfaddasu" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Addasu pwy all ryngweithio â'r postiad hwn." +msgstr "Dewisiadau cyfaddasu<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Yn addasu eich profiad Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Heriau neu weithgareddau peryglus" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Sylweddau peryglus neu gamdriniaeth cyffuriau" @@ -2854,7 +2617,6 @@ msgstr "Sylweddau peryglus neu gamdriniaeth cyffuriau" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Tywyll" @@ -2891,19 +2653,13 @@ msgstr "Panel dadfygio" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Cynnwys ffugiol dwys oedolion" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Rhagosodiad" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Eiconau rhagosodedig" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Analluogi E-bost 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Analluogi adborth haptig" +msgstr "Analluogi adborth haptig<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3182,7 +2926,7 @@ msgstr "Darganfod Ffrydiau Newydd" msgid "Dismiss" msgstr "Cau" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Cau'r gwall" @@ -3270,11 +3014,8 @@ msgstr "Peidiwch â phoeni! Mae'r holl negeseuon a gosodiadau wedi'u cadw a bydd #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3322,9 +3063,8 @@ msgstr "Llwythwch Bluesky i Lawr" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Llwythwch ffeil CAR i lawr" +msgstr "Llwythwch ffeil CAR i lawr<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3347,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Docsio" ->>>>>>> upstream/main +msgstr "Docsio>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3396,11 +3131,7 @@ msgstr "e.e. Defnyddwyr sy'n ateb dro ar ôl tro gyda hysbysebion." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Anhwylderau bwyta" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3417,7 +3148,7 @@ msgid "Edit" msgstr "Golygu" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Golygu afatar" @@ -3692,7 +3423,7 @@ msgstr "Yn mynd i'r sgrin lawn" msgid "Entertainment" msgstr "Adloniant" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Gwall" @@ -3713,11 +3444,11 @@ msgstr "Neges gwall" msgid "Error occurred while saving file" msgstr "Bu gwall wrth gadw ffeil" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Gwall wrth dderbyn ymateb captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Gwall: {error}" @@ -3739,19 +3470,8 @@ msgstr "Pawb" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Popeth arall" +msgstr "Popeth arall<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Gormod o grybwylliadau neu atebion" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Gormod o negeseuon neu rhai diangen" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Eithrio defnyddwyr rydych yn eu dilyn" @@ -3875,11 +3595,7 @@ msgstr "Dewisiadau Cyfryngau Allanol" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Cynnwys eithafwyr" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4083,23 +3799,13 @@ msgstr "Wedi methu dilysu enw dangos. Ceisiwch eto." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Cyfrif ffug neu fot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Gwybodaeth ffug am etholiadau" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Ffrwd" @@ -4240,26 +3946,8 @@ msgstr "Gorffen" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Ffitrwydd" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Du Disglein" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Glas Disglein" +msgstr "Ffitrwydd<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Gwyn Disglein" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Hyblyg" @@ -4270,16 +3958,7 @@ msgstr "Hyblyg" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Dilyn" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Dilyn" @@ -4322,16 +4001,8 @@ msgstr "Dilynwch bob cyfrif" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Dilynwch Nôl" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Dilynwch Nôl" @@ -4371,13 +4042,9 @@ msgstr "Dilynwyr rydych chi'n eu hadnabod" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Yn Dilyn" @@ -4385,16 +4052,11 @@ msgstr "Yn Dilyn" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Yn Dilyn" +msgstr "Yn Dilyn<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Yn dilyn {0}" @@ -4481,15 +4143,8 @@ msgstr "Wedi anghofio?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Ryddhewch eich ffrwd" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Yn Postio Cynnwys Diangen yn Aml" +msgstr "Ryddhewch eich ffrwd<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Oddi wrth" @@ -4590,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Rhowch wyneb i'ch proffil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Torri cyfraith neu delerau gwasanaeth amlwg" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Gogoneddu trais" ->>>>>>> upstream/main +msgstr "Rhowch wyneb i'ch proffil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4711,18 +4356,7 @@ msgstr "Cyfryngau Graffig" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "Cynnwys treisiol graffig" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4730,8 +4364,7 @@ msgstr "Ymddygiad rheibus neu ddenu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacio neu ymosodiadau systemau" ->>>>>>> upstream/main +msgstr "Hacio neu ymosodiadau systemau>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4762,24 +4395,8 @@ msgstr "Hapteg" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Aflonyddu, trolio, neu anoddefgarwch" -======= -msgstr "Aflonyddu neu gasineb" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Gweithgareddau niweidiol neu risg uchel" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Niweidio neu beryglu plant dan oed" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4798,11 +4415,7 @@ msgstr "Hashnod {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Siarad casineb" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4811,15 +4424,10 @@ msgstr "Oes gennych chi god? <0>Cliciwch yma." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Yn cael trafferth?" +msgstr "Yn cael trafferth?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4878,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Cuddio dewisiadau cyfaddasu" +msgstr "Cuddio dewisiadau cyfaddasu<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Cuddio postiad drosof fi" @@ -5014,11 +4613,7 @@ msgstr "Sut dylen ni agor y ddolen hon?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Masnachu pobl" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5082,17 +4677,9 @@ msgstr "Os ydych chi'n ddatblygwr, gallwch chi gynnal eich gweinydd eich hun." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Os ydych chi'n ceisio newid eich enw dangos neu'ch e-bost, gwnewch hynny cyn i chi ei ei gau." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Anghyfreithlon a Brys" +msgstr "Os ydych chi'n ceisio newid eich enw dangos neu'ch e-bost, gwnewch hynny cyn i chi ei ei gau.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Delwedd" @@ -5112,29 +4699,15 @@ msgstr "Delwedd wedi'i chadw" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Does dim modd cadw delweddau oni bai fod caniatâd wedi'i roi i gael mynediad i'ch llyfrgell lluniau." +msgstr "Does dim modd cadw delweddau oni bai fod caniatâd wedi'i roi i gael mynediad i'ch llyfrgell lluniau.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Dynwared neu honiadau ffug am hunaniaeth neu ymlyniad" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Dynwared, gwybodaeth anghywir, neu honiadau ffug" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Personadu" ->>>>>>> upstream/main +msgstr "Personadu>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5162,15 +4735,8 @@ msgstr "O fewn yr ap, Gwthio, Pawb" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "O fewn yr ap, Gwthio, Pobl rydych yn eu dilyn" +msgstr "O fewn yr ap, Gwthio, Pobl rydych yn eu dilyn<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Negeseuon amhriodol neu ddolenni penodol" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5198,21 +4764,13 @@ msgstr "Mewnbynnu cyfrinair ar gyfer dileu cyfrif" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Mewnbynnwch y cod sydd wedi'i e-bostio atoch" +msgstr "Mewnbynnwch y cod sydd wedi'i e-bostio atoch<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Rhyngweithio yn gyfyngedig" @@ -5286,7 +4844,7 @@ msgstr "Dim ond <0>{0}ar hyn o bryd! Ychwanegwch fwy o bobl at eich pecyn cy msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Dim ond chi ar hyn o bryd! Ychwanegwch fwy o bobl at eich pecyn cychwyn trwy chwilio uchod." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID gwaith: {0}" @@ -5329,17 +4887,13 @@ msgstr "Wedi'i labelu gan {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Wedi'i labelu gan yr awdur." +msgstr "Wedi'i labelu gan yr awdur.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Labeli" @@ -5404,17 +4958,9 @@ msgstr "Dysgu Rhagor" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Rhagor o wybodaeth am sicrwydd oed" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Dysgwch ragor am Bluesky" +msgstr "Rhagor o wybodaeth am sicrwydd oed<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Dysgu rhagor am hunan westeio eich PDS." @@ -5449,15 +4995,10 @@ msgstr "Dysgu rhagor am yr hyn sy'n gyhoeddus ar Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Mae rhagor o wybodaeth yn eich <0>gosodiadau cyfrif" +msgstr "Mae rhagor o wybodaeth yn eich <0>gosodiadau cyfrif<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Dysgu rhagor." @@ -5521,11 +5062,7 @@ msgid "Like" msgstr "Hoffi" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Hoffi ({0, plural, one {# hoffi} other {# hoffi}})" @@ -5588,13 +5125,9 @@ msgstr "Hoffi eich ail bostiadau" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Hoffi eich hysbysiadau ail bostio" +msgstr "Hoffi eich hysbysiadau ail bostio<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Hoffi ar y postiad hwn" @@ -5898,49 +5431,24 @@ msgstr "Dewisiadau negeseuon" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Negeseuon" +msgstr "Negeseuon<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Canol Nos" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Aflonyddu neu fwlio plant dan oed" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Hysbysiadau amrywiol" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cyfrif Camarweiniol" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Postiad Camarweiniol" -======= -msgstr "Camarweiniol" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6000,15 +5508,10 @@ msgstr "Offer cymedroli" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Mae'r cymedrolwr wedi dewis gosod rhybudd cyffredinol ar y cynnwys." +msgstr "Mae'r cymedrolwr wedi dewis gosod rhybudd cyffredinol ar y cynnwys.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Rhagor o ffrydiau" @@ -6149,18 +5652,8 @@ msgstr "Fy Ffrydiau" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Enw" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Enw neu Ddisgrifiad yn Torri Safonau Cymunedol" - -======= ->>>>>>> upstream/main +msgstr "Enw<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6364,16 +5857,11 @@ msgstr "Dim delwedd" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Dim hoffi eto" +msgstr "Dim hoffi eto<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ddim yn dilyn {0} bellach" @@ -6385,7 +5873,7 @@ msgstr "Dim negeseuon eto" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Dim rhagor o algorithmau sgrolio gwae, ofer. Darganfyddwch ffrydiau sy'n gweithio drosoch chi, nid yn eich erbyn." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Dim hysbysiadau eto!" @@ -6439,9 +5927,9 @@ msgstr "Heb ganfod canlyniad" msgid "No results found for \"{query}\"" msgstr "Heb ganfod canlyniadau \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Heb ganfod canlyniadau {query}" @@ -6481,11 +5969,7 @@ msgstr "Heb ddod o hyd i neb. Ceisiwch chwilio am rywun arall." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Delweddau personol heb gydsyniad" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6580,15 +6064,8 @@ msgstr "Nawr" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Noethni" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Noethni neu gynnwys i oedolion heb ei labelu felly" +msgstr "Noethni<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6609,11 +6086,7 @@ msgid "OK" msgstr "Iawn" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Iawn" @@ -6714,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Agor dewislen drôr" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Agor y dewisydd emojis" @@ -6814,7 +6287,7 @@ msgstr "Yn agor y cyfansoddwr" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Yn agor oriel dyfais i ddewis hyd at {MAX_IMAGES, plural, other {# delwedd}}, neu un fideo neu GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Yn agor y dewisydd emojis" @@ -6854,15 +6327,10 @@ msgstr "Yn agor ffurflen ailosod cyfrinair" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Yn agor gosodiadau ieithoedd postiadau" +msgstr "Yn agor gosodiadau ieithoedd postiadau<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Yn agor y proffil hwn" @@ -6896,12 +6364,7 @@ msgstr "Statws OTA: Dim ar gael" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Arall" @@ -6911,35 +6374,8 @@ msgstr "Cyfrif arall" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Materion diogelu plant eraill" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Cynnwys peryglus eraill" @@ -6962,8 +6398,7 @@ msgstr "Cynnwys treisiol rhywiol eraill" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Cynnwys treisiol eraill" ->>>>>>> upstream/main +msgstr "Cynnwys treisiol eraill>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7039,23 +6474,16 @@ msgstr "Pobl yn dilyn @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Pobl rwy'n eu dilyn" +msgstr "Pobl rwy'n eu dilyn<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Cafodd caniatâd i gael mynediad at eich lluniau ei wrthod. Galluogwch ef yng ngosodiadau eich system." @@ -7312,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postio" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Postio" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Postio'r Cyfan" @@ -7340,19 +6768,12 @@ msgstr "Dilëwyd y postiad" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Methodd y postiad a llwytho i fyny. Gwiriwch eich cysylltiad rhyngrwyd a rhowch gynnig arall arni." +msgstr "Methodd y postiad a llwytho i fyny. Gwiriwch eich cysylltiad rhyngrwyd a rhowch gynnig arall arni.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Mae'r postiad wedi'i ddileu" @@ -7486,13 +6907,9 @@ msgstr "Polisi Preifatwydd" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Torri ar breifatrwydd plentyn dan oed" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Yn prosesu fideo..." @@ -7520,13 +6937,10 @@ msgstr "Proffil wedi'i ddiweddaru" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD -======= -msgstr "Hyrwyddo neu werthu eitemau neu wasanaethau wedi'u gwahardd" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 @@ -7542,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Rhestrau cyhoeddus, y mae modd eu rhannu a'u defnyddio i yrru ffrydiau." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Cyhoeddi postiad" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Cyhoeddi postiadau" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Cyhoeddi atebion" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Cyhoeddi ateb" @@ -7620,13 +7034,9 @@ msgstr "Analluogwyd postiadau dyfyniad" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Dyfyniadau" +msgstr "Dyfyniadau<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Dyfyniadau'r postiad hwn" @@ -7687,12 +7097,12 @@ msgstr "Darllenwch Delerau Gwasanaeth Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7783,8 +7193,8 @@ msgstr "Tynnu atodiad" msgid "Remove Avatar" msgstr "Tynnu Afatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Tynnu Baner" @@ -7958,17 +7368,13 @@ msgstr "Analluogwyd atebion" msgid "Replies to this post are disabled." msgstr "Mae atebion i'r postiad hwn wedi'u hanalluogi." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Ateb" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Ateb ({0, plural, one {# ateb} other {# ateb}})" @@ -8058,11 +7464,7 @@ msgstr "Adroddiad wedi ei gyflwyno" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Adrodd am y sgwrs" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8133,13 +7535,9 @@ msgstr "Wedi'i ail-bostio gennych chi" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Ail bostiadau" +msgstr "Ail bostiadau<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Ail-bostiadau'r postiad hwn" @@ -8212,17 +7610,13 @@ msgstr "Ailosod cyflwr cyflwyno" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Ailosod cyfrinair" +msgstr "Ailosod cyfrinair<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Yn ceisio mewngofnodi eto" @@ -8375,28 +7769,21 @@ msgstr "Dywedwch helo!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Sgam" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Gwyddoniaeth" +msgstr "Gwyddoniaeth<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Sgrolio i'r chwith" @@ -8441,11 +7828,11 @@ msgstr "Chwiliwch am \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Chwiliwch am \"{interestsDisplayName}\" (gweithredol)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Chwiliwch am \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Chwiliwch am \"{searchText}\"" @@ -8470,7 +7857,7 @@ msgid "Search GIFs" msgstr "Chwilio GIFau" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Dyw chwilio ddim ar gael pan nad ydych wedi mewngofnodi" @@ -8563,11 +7950,7 @@ msgstr "Dewiswch liw" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Dewis rheswm" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8704,11 +8087,7 @@ msgstr "Dyw dewis mathau lluosog o gyfryngau ddim yn cael ei gynnal." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ymddygiadau hunan niweidiol neu beryglus" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8778,19 +8157,12 @@ msgstr "Gosod dyddiad geni" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Gosod cyfrinair newydd" +msgstr "Gosod cyfrinair newydd<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Gosodwch eich cyfrif" @@ -8942,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9032,15 +8400,10 @@ msgstr "Dangos atebion" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Dangos atebion fel" +msgstr "Dangos atebion fel<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Dangos ateb i bawb" @@ -9060,13 +8423,9 @@ msgstr "Dangos rhybudd" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Dangos rhybudd a hidlo o ffrydiau" +msgstr "Dangos rhybudd a hidlo o ffrydiau<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Yn dangos manylion pryd cafodd y postiad hwn ei chreu" @@ -9087,7 +8446,7 @@ msgstr "Yn dangos y cynnwys" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9294,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Ffynhonnell: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Sbam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Sbam; gormod o grybwylliadau neu atebion" -======= -msgstr "Sbam neu ymddygiad annilys neu dwyllodrus" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9467,23 +8813,9 @@ msgstr "Awgrymiadau i chi" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Awgrymiadol" +msgstr "Awgrymiadol<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Codiad Haul" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Machlud Haul" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9555,11 +8887,7 @@ msgstr "Tapiwch i gau" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Aflonyddu wedi'i dargedu" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9605,18 +8933,8 @@ msgstr "Telerau" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Telerau Gwasanaeth" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Mae'r termau sy'n cael eu defnyddio'n torri'r safonau cymunedol" - -======= ->>>>>>> upstream/main +msgstr "Telerau Gwasanaeth<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Testun a thagiau" @@ -9665,11 +8983,7 @@ msgid "That's everything!" msgstr "Dyna bopeth!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Bydd y cyfrif yn gallu rhyngweithio â chi ar ôl ei ddadrwystro." @@ -9801,17 +9115,12 @@ msgstr "Bu anhawster wrth gysylltu â'r gweinydd" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Bu anhawster wrth gysylltu â'r gweinydd, gwiriwch eich cysylltiad rhyngrwyd a rhowch gynnig arall arni." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Bu anhawster wrth geisio cael hysbysiadau. Tapiwch yma i geisio eto." +msgstr "Bu anhawster wrth geisio cael hysbysiadau. Tapiwch yma i geisio eto.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Bu anhawster wrth nôl postiadau. Tapiwch yma i geisio eto." @@ -9850,16 +9159,9 @@ msgstr "Bu anhawster wrth ddiweddaru'ch ffrydiau, gwiriwch eich cysylltiad rhyng #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9887,19 +9189,14 @@ msgstr "Roedd problem annisgwyl yn y rhaglen. Rhowch wybod i ni os digwyddodd hy #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Mae yna ruthr o ddefnyddwyr newydd wedi bod i Bluesky! Byddwn yn agor eich cyfrif cyn gynted ag y gallwn." +msgstr "Mae yna ruthr o ddefnyddwyr newydd wedi bod i Bluesky! Byddwn yn agor eich cyfrif cyn gynted ag y gallwn.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10052,13 +9349,9 @@ msgstr "Mae'r rhestr hon yn wag." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Dyw'r gwasanaeth cymedroli hwn ddim ar gael. Gweler isod am ragor o fanylion. Os bydd y mater hwn yn parhau, cysylltwch â ni." +msgstr "Dyw'r gwasanaeth cymedroli hwn ddim ar gael. Gweler isod am ragor o fanylion. Os bydd y mater hwn yn parhau, cysylltwch â ni.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Mae'r postiad hwn yn honni iddo gael ei greu ar <0>{0}, ond fe'i gwelwyd gyntaf gan Bluesky ar <1>{1}." @@ -10176,11 +9469,7 @@ msgstr "Dewisiadau Edafedd" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bygythiadau neu anogaethau" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10230,17 +9519,10 @@ msgstr "Pwnc" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Cyfieithu" @@ -10259,11 +9541,7 @@ msgstr "Fideos Tueddol" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolio" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10366,22 +9644,13 @@ msgstr "Dadflocio" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Dadrwystro cyfrif" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Dadrwystro Cyfrif?" @@ -10403,16 +9672,8 @@ msgstr "Dadwneud ail-bostio" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Dad-wneud ail-bostio ({0, plural, one {# ail-bostio} other {# ail-bostio}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Dad-ddilyn" +msgstr "Dad-wneud ail-bostio ({0, plural, one {# ail-bostio} other {# ail-bostio}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Dad-ddilyn {0}" @@ -10440,32 +9701,18 @@ msgstr "Dilysydd anhysbys" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Cynnwys oedolion heb eu labeli" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Cynnwys oedolion heb gydsyniad neu fygythiol, heb ei labelu" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Dad-hoffi" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Dadhoffi ({0, plural, one {# hoffi} other {# hoffi}})" @@ -10576,16 +9823,8 @@ msgstr "Wedi dad-danysgrifio o'r rhestr" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Math o fideo sydd ddim yn cael ei gynnal: {mimeType}" +msgstr "Math o fideo sydd ddim yn cael ei gynnal: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Cynnwys Rhywiol Dieisiau" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10635,20 +9874,20 @@ msgstr "Llwytho ffeil testun i fyny i:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Llwytho i fyny o'r Camera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Llwytho i fyny o'r Ffeiliau" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Llwytho i fyny o'r Llyfrgell" @@ -10661,7 +9900,7 @@ msgstr "Wrthi'n lwytho lluniau i fyny..." msgid "Uploading link thumbnail..." msgstr "Wrthi'n lwytho dolen llun bach i fyny..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Wrthi'n llwytho fideo i fyny..." @@ -10915,7 +10154,7 @@ msgstr "Fideo heb ei ganfod." msgid "Video settings" msgstr "Gosodiadau fideo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Fideo wedi'i lwytho i fyny" @@ -10940,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Edrych" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Gweld afatar {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10966,15 +10209,10 @@ msgstr "Gweld cofnod blog am fwy o fanylion" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Gweld cofnod dadfygio" +msgstr "Gweld cofnod dadfygio<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Manylion" @@ -11010,10 +10248,6 @@ msgstr "Edrych ar y postiad" msgid "View profile" msgstr "Gweld proffil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Gweld yr afatar" @@ -11057,15 +10291,10 @@ msgstr "Gweld eich cyfrifon wedi tewi" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Gweld eich dilysiadau" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Gweld eich dilysiadau<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Yn gweld delwedd lawn" @@ -11075,24 +10304,16 @@ msgstr "Yn gweld fideo yn y modd trochi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Cynnwys treisiol neu fygythiol>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Trais" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Cynnwys treisiol neu fygythiol" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11242,7 +10463,7 @@ msgstr "Mae'n ddrwg gennym, ond nid oeddem yn gallu datrys y rhestr hon. Os bydd msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Mae'n ddrwg gennym, ond nid oeddem yn gallu llwytho eich geiriau wedi'u tewi ar hyn o bryd. Ceisiwch eto." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Mae'n ddrwg gennym, ond nid oedd modd cwblhau eich chwilio. Ceisiwch eto ymhen ychydig funudau." @@ -11343,11 +10564,7 @@ msgstr "Pam ydych chi'n apelio?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Pam dylai'r sgwrs hon gael ei adolygu?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11374,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Pam dylai'r defnyddiwr hwn gael ei adolygu?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Hoffech chi rwystro'r defnyddiwr hwn a/neu ddileu'r sgwrs hon?" ->>>>>>> upstream/main +msgstr "Hoffech chi rwystro'r defnyddiwr hwn a/neu ddileu'r sgwrs hon?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11814,11 +11026,7 @@ msgstr "Rydych wedi mewngofnodi gyda Chyfrinair Ap. Mewngofnodwch gyda'ch prif g #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Rydych eisoes wedi apelio'r label hwn ac mae'n cael ei adolygu gan ein tîm cymedroli." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/da/messages.po b/src/locale/locales/da/messages.po index 8bcee3578..4a1e47565 100644 --- a/src/locale/locales/da/messages.po +++ b/src/locale/locales/da/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {følger} other {følgere}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {følger} other {følger}}" +msgstr "{0, plural, one {følger} other {følger}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {like} other {likes}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {opslag} other {opslag}}" +msgstr "{0, plural, one {opslag} other {opslag}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citat} other {citater}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {deling} other {delinger}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citat} other {citater}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {deling} other {delinger}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {gemt} other {gemte}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, one {}other {+# flere}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Konto)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} kl. {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Log ind<1> eller <2>opret en konto<3> <4>for at søge efter nyheder, sport, politik og alt andet, der sker på Bluesky." @@ -615,30 +595,19 @@ msgstr "Tilgængelighed" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tilgængelighedsindstillinger" +msgstr "Tilgængelighedsindstillinger<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto" +msgstr "Konto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Konto blokeret" @@ -665,26 +634,18 @@ msgstr "Konto skjult af liste" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontoindstillinger" +msgstr "Kontoindstillinger<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Konto fjernet fra kvikadgang" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Blokering af konto fjernet" @@ -774,7 +735,7 @@ msgstr "Tilføj endnu en konto" msgid "Add another post" msgstr "Tilføj endnu et opslag" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Tilføj endnu et opslag til tråd" @@ -890,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Porno" @@ -1120,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Illustration som viser, hvordan Bluesky udvælger autoriserede verifikatorer, som herefter verificerer enkelte brugerkonti." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "En anden årsag, der ikke er omfattet af ovennævnte" @@ -1181,21 +1134,11 @@ msgstr "Nyhed" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky introducerer verificerede konti" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Asocial adfærd" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Bluesky introducerer verificerede konti<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1246,15 +1189,10 @@ msgstr "Navne på appadgangskoder skal bestå af mindst 4 tegn" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Appadgangskoder" +msgstr "Appadgangskoder<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Appadgangskoder" @@ -1287,19 +1225,12 @@ msgstr "Klag over suspendering" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Klag over afgørelse" +msgstr "Klag over afgørelse<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Udseende" @@ -1311,23 +1242,14 @@ msgstr "Brug anbefalede standardfeeds" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Anvend pull request" +msgstr "Anvend pull request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arkiveret fra {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arkiveret fra {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arkiveret opslag" @@ -1396,18 +1318,11 @@ msgstr "Vælg emne for algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Mindst 8 tegn" +msgstr "Mindst 8 tegn<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Nordlys" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1421,13 +1336,8 @@ msgstr "Tilgængelig" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1436,7 +1346,7 @@ msgstr "Tilgængelig" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1501,9 +1411,8 @@ msgstr "Begynd alderstjek ved at udfylde felterne herunder." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Fødselsdato" +msgstr "Fødselsdato<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1511,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloker" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloker konto" @@ -1551,15 +1446,8 @@ msgstr "Bloker konti" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloker og slet" +msgstr "Bloker og slet<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloker og/eller slet denne samtale" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloker liste" @@ -1579,18 +1467,14 @@ msgstr "Bloker bruger" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloker bruger" +msgstr "Bloker bruger<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blokeret" @@ -1622,40 +1506,18 @@ msgstr "Blokering er offentlig. Blokerede konti kan ikke svare i dine tråde, om #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blokering vil ikke spærre for, at der bliver sat mærkater på din konto, men det vil forhindre denne konto fra at svare i dine tråde eller interagere med dig." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky kan ikke bekræfte den anførte datos gyldighed." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blokering vil ikke spærre for, at der bliver sat mærkater på din konto, men det vil forhindre denne konto fra at svare i dine tråde eller interagere med dig.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky kan ikke bekræfte den anførte datos gyldighed." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky er et åbent netværk, hvor du kan vælge din egen udbyder. Hvis du er udvikler, kan du køre din egen server." @@ -1707,13 +1569,9 @@ msgstr "Bøger" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Se flere konti under Udforsk" @@ -1824,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1864,17 +1716,11 @@ msgstr "Annuller genaktivering og log ud" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annuller søgning" +msgstr "Annuller søgning<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Kan ikke interagere med en blokeret bruger" @@ -1987,11 +1833,7 @@ msgid "Chat requests" msgstr "Chatanmodninger" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2154,19 +1996,11 @@ msgstr "Hyp 🐴 hyp 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2236,7 +2070,7 @@ msgstr "Luk velkomstdialog" msgid "Closes password update alert" msgstr "Lukker besked om opdatering af adganskode" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Lukker skrivefelt og kasserer udkast til opslag" @@ -2308,7 +2142,7 @@ msgstr "Skriv opslag på op til {0, plural, one {}other {# tegn}}" msgid "Compose reply" msgstr "Skriv svar" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Komprimerer video..." @@ -2538,17 +2372,11 @@ msgstr "Kopier forfatter-DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopier kode" +msgstr "Kopier kode<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopier DID" @@ -2710,7 +2538,7 @@ msgstr "Opret konto" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Opret en konto" @@ -2771,15 +2599,8 @@ msgstr "Tilpasset" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Tilpasningsindstillinger" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Tilpas, hvem der kan interagere med dette opslag." +msgstr "Tilpasningsindstillinger<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Tilpas din Bluesky-oplevelse" @@ -2790,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Mørk" @@ -2839,17 +2653,13 @@ msgstr "Fejlsøgningspanel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Standard" @@ -2858,17 +2668,10 @@ msgid "Default icons" msgstr "Standardikoner" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3031,20 +2834,26 @@ msgstr "Deaktiver tofaktorgodkendelse via e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Deaktiver haptisk feedback" +msgstr "Deaktiver haptisk feedback<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3058,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3128,7 +2926,7 @@ msgstr "Find nye feeds" msgid "Dismiss" msgstr "Luk" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Luk fejlbesked" @@ -3216,11 +3014,8 @@ msgstr "Bare rolig! Alle eksisterende beskeder og indstillinger er gemt og vi bl #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3268,9 +3063,8 @@ msgstr "Download Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Download CAR-fil" +msgstr "Download CAR-fil<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3289,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3356,7 +3148,7 @@ msgid "Edit" msgstr "Rediger" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Rediger avatar" @@ -3631,7 +3423,7 @@ msgstr "Åbner i fuld skærm" msgid "Entertainment" msgstr "Underholdning" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Fejl" @@ -3652,11 +3444,11 @@ msgstr "Fejlmeddelelse" msgid "Error occurred while saving file" msgstr "En fejl opstod under lagring af fil" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "En fejl opstod under modtagelse af opgaveløsning" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Fejl: {error}" @@ -3678,19 +3470,8 @@ msgstr "Alle" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Alt andet" +msgstr "Alt andet<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "For mange omtaler eller svar" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "For mange eller uønskede beskeder" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Udelad brugere, du følger" @@ -4022,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4169,26 +3946,8 @@ msgstr "Afslut" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Motion" +msgstr "Motion<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Flad sort" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Flad blå" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Flad hvid" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Fleksibel" @@ -4199,16 +3958,7 @@ msgstr "Fleksibel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Følg" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Følg" @@ -4251,16 +4001,8 @@ msgstr "Følg alle konti" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Følg tilbage" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Følg tilbage" @@ -4300,13 +4042,9 @@ msgstr "Følgere du kender" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Følger" @@ -4314,16 +4052,11 @@ msgstr "Følger" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Følger" +msgstr "Følger<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Følger {0}" @@ -4410,15 +4143,8 @@ msgstr "Glemt?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Slip dit feed fri" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Laver tit opslag med uønsket indhold" +msgstr "Slip dit feed fri<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Fra" @@ -4519,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Sæt ansigt på din profil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Åbenlys overtrædelse af lovgivning eller tjenestevilkår" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Sæt ansigt på din profil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4679,21 +4395,7 @@ msgstr "Haptisk feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Chikane, trolling og intolerance" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4722,15 +4424,10 @@ msgstr "Har du en kode? <0>Klik her." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Har du problemer?" +msgstr "Har du problemer?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4789,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Skjul tilpasningsindstillinger" +msgstr "Skjul tilpasningsindstillinger<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Skjul opslag for mig" @@ -4989,17 +4677,9 @@ msgstr "Hvis du er udvikler, kan du køre din egen server." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Hvis du vil skifte dit handle eller din e-mail, skal du gøre det, før du deaktiverer kontoen." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ulovligt og akut" +msgstr "Hvis du vil skifte dit handle eller din e-mail, skal du gøre det, før du deaktiverer kontoen.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Billede" @@ -5019,29 +4699,15 @@ msgstr "Billede blev gemt" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Billeder kan ikke gemmes, medmindre du giver adgang til dit fotobibliotek." +msgstr "Billeder kan ikke gemmes, medmindre du giver adgang til dit fotobibliotek.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Identitetstyveri eller falske oplysninger om identitet eller tilknytning" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Identitetstyveri, misinformation eller falske påstande" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5069,15 +4735,8 @@ msgstr "I appen, Push, Alle" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "I appen, Push, Personer, du følger" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Upassende beskeder eller links med seksuelt indhold" +msgstr "I appen, Push, Personer, du følger<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5105,21 +4764,13 @@ msgstr "Indtast adgangskode for sletning af konto" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Indtast den kode, du har modtaget på e-mail" +msgstr "Indtast den kode, du har modtaget på e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaktion begrænset" @@ -5193,7 +4844,7 @@ msgstr "Der er kun <0>{0} lige nu! Føj flere personer til din startpakke ve msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Lige nu er der kun dig! Føj flere personer til din startpakke ved at søge herover." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Job-ID: {0}" @@ -5236,17 +4887,13 @@ msgstr "Mærkat tilføjet af {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Mærkat tilføjet af forfatteren." +msgstr "Mærkat tilføjet af forfatteren.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Mærkater" @@ -5311,17 +4958,9 @@ msgstr "Læs mere" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Læs mere om alderstjek" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Læs mere om Bluesky" +msgstr "Læs mere om alderstjek<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Læs mere om at hoste din egen PDS." @@ -5356,15 +4995,10 @@ msgstr "Læs mere om, hvad der er offentligt på Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Læs mere under <0>kontoindstillinger." +msgstr "Læs mere under <0>kontoindstillinger.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Læs mere." @@ -5428,11 +5062,7 @@ msgid "Like" msgstr "Like" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Like ({0, plural, one {# like} other {# likes}})" @@ -5495,13 +5125,9 @@ msgstr "Likes af dine videredelinger" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifikationer ved videredeling af videredelinger" +msgstr "Notifikationer ved videredeling af videredelinger<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Likes af dette opslag" @@ -5805,45 +5431,23 @@ msgstr "Beskedindstillinger" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Beskeder" +msgstr "Beskeder<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Midnat" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Diverse notifikationer" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Vildledende konto" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Vildledende opslag" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5904,15 +5508,10 @@ msgstr "Moderationsværktøjer" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderator har besluttet at sætte en generel advarsel på indholdet." +msgstr "Moderator har besluttet at sætte en generel advarsel på indholdet.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Flere feeds" @@ -6053,18 +5652,8 @@ msgstr "Mine feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Navn" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Navn eller beskrivelse overtræder fælleskabsreglerne" - -======= ->>>>>>> upstream/main +msgstr "Navn<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6268,16 +5857,11 @@ msgstr "Intet billede" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ingen likes endnu." +msgstr "Ingen likes endnu.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Følger ikke længere {0}" @@ -6289,7 +5873,7 @@ msgstr "Ingen beskeder endnu" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Ingen algoritmer, der prioriterer spam og belønner doomscrolling. Find feeds, der arbejder for dig, ikke imod dig." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ingen notifikationer endnu!" @@ -6343,9 +5927,9 @@ msgstr "Ingen resultater fundet" msgid "No results found for \"{query}\"" msgstr "Ingen resultater fundet for \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Ingen resultater fundet for {query}" @@ -6480,15 +6064,8 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nøgenhed" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nøgenhed eller voksenindhold, som ikke er mærket som dette" +msgstr "Nøgenhed<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6509,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okay" @@ -6614,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Åbn navigation" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Åbn emojivælger" @@ -6714,7 +6287,7 @@ msgstr "Åbner skrivefelt til nyt opslag" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Åbner enhedens mediabibliotek for valg af op til {MAX_IMAGES, plural, one {}other {# billeder}}, eller en enkelt video eller GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Åbner emojivælger" @@ -6754,15 +6327,10 @@ msgstr "Åbner formular til nulstilling af adgangskode" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Åbner opslagets sprogindstillinger" +msgstr "Åbner opslagets sprogindstillinger<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Åbner denne profil" @@ -6796,12 +6364,7 @@ msgstr "OTA-status: Ingen tilgængelig" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Andet" @@ -6911,23 +6474,16 @@ msgstr "Personer, som @{0} følger" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Personer jeg følger" +msgstr "Personer jeg følger<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Adgang til dit fotobibliotek blev nægtet. Tillad adgang fra dine systemindstillinger." @@ -7184,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Opslag" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Slå op" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Slå alle op" @@ -7212,19 +6768,12 @@ msgstr "Opslag slettet" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Opslag kunne ikke publiceres. Tjek din internetforbindelse og prøv igen." +msgstr "Opslag kunne ikke publiceres. Tjek din internetforbindelse og prøv igen.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Indlæg er blevet slettet" @@ -7360,7 +6909,7 @@ msgstr "Privatlivspolitik" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Behandler video..." @@ -7388,19 +6937,12 @@ msgstr "Profil opdateret" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Offentlig" @@ -7414,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Offentlige lister, der kan bruges som feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Udgiv opslag" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Udgiv opslag" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Udgiv svar" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Udgiv svar" @@ -7492,13 +7034,9 @@ msgstr "Citatopslag ikke tilladt" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citater" +msgstr "Citater<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citater af dette opslag" @@ -7559,12 +7097,12 @@ msgstr "Læs Blueskys tjenestevilkår" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7655,8 +7193,8 @@ msgstr "Fjern vedhæftning" msgid "Remove Avatar" msgstr "Fjern avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Fjern banner" @@ -7830,17 +7368,13 @@ msgstr "Svar ikke tilladt" msgid "Replies to this post are disabled." msgstr "Svar til dette opslag er ikke tilladt." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Besvar" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Svar ({0, plural, one {# svar} other {# svar}})" @@ -8001,13 +7535,9 @@ msgstr "Videredelt af dig" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Videredelinger" +msgstr "Videredelinger<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Videredelinger af dette opslag" @@ -8080,17 +7610,13 @@ msgstr "Nulstil velkomsttilstand" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Nulstil adgangskode" +msgstr "Nulstil adgangskode<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Forsøger at logge ind igen" @@ -8248,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Videnskab" +msgstr "Videnskab<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Rul til venstre" @@ -8305,11 +7828,11 @@ msgstr "Søgning efter \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Søgning efter \"{interestsDisplayName}\" (aktiv)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Søg efter \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Søg efter \"{searchText}\"" @@ -8334,7 +7857,7 @@ msgid "Search GIFs" msgstr "Søg efter GIF'er" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Søgning er i øjeblikket kun tilgængeligt for indloggede brugere" @@ -8634,19 +8157,12 @@ msgstr "Angiv fødselsdato" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Angiv ny adgangskode" +msgstr "Angiv ny adgangskode<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Konfigurer din konto" @@ -8798,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8888,15 +8400,10 @@ msgstr "Vis svar" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Vis svar" +msgstr "Vis svar<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Vis svar til alle" @@ -8916,13 +8423,9 @@ msgstr "Vis advarsel" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Vis advarsel og filtrer fra feeds" +msgstr "Vis advarsel og filtrer fra feeds<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Viser, hvornår dette opslag blev oprettet" @@ -8943,7 +8446,7 @@ msgstr "Viser indholdet" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9150,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Kilde: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; for mange omtaler eller svar" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9322,23 +8813,9 @@ msgstr "Foreslået til dig" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Seksuelle undertoner" +msgstr "Seksuelle undertoner<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Solopgang" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Solnedgang" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9456,18 +8933,8 @@ msgstr "Tjenestevilkår" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Tjenestevilkår" +msgstr "Tjenestevilkår<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Sprogbrug overtræder fælleskabsreglerne" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Tekst og tags" @@ -9516,11 +8983,7 @@ msgid "That's everything!" msgstr "Det var alt" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Kontoen vil være i stand til at interagere med dig, når du fjerner blokering." @@ -9652,17 +9115,12 @@ msgstr "Der kunne ikke skabes forbindelse til serveren" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Der kunne ikke skabes forbindelse til serveren. Tjek din internetforbindelse og prøv igen." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Notifikationer kunne ikke indlæses. Tryk her for at prøve igen." +msgstr "Notifikationer kunne ikke indlæses. Tryk her for at prøve igen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Opslag kunne ikke indlæses. Tryk her for at prøve igen." @@ -9701,16 +9159,9 @@ msgstr "Dine feeds kunne ikke opdateres. Tjek din internetforbindelse og prøv i #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9738,19 +9189,14 @@ msgstr "Der opstod en uventet fejl i appen. Giv os besked om, at det er sket for #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Der kommer mange nye brugere til Bluesky for tiden! Vi aktiverer din konto, så snart vi kan." +msgstr "Der kommer mange nye brugere til Bluesky for tiden! Vi aktiverer din konto, så snart vi kan.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9903,13 +9349,9 @@ msgstr "Denne liste er tom." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Denne moderationstjeneste er utilgængelig. Se herunder for flere oplysninger. Kontakt os, hvis dette problem varer ved." +msgstr "Denne moderationstjeneste er utilgængelig. Se herunder for flere oplysninger. Kontakt os, hvis dette problem varer ved.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Dette opslag er dateret <0>{0}, men det blev først oprettet på Bluesky <1>{1}." @@ -10077,17 +9519,10 @@ msgstr "Emne" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Oversæt" @@ -10209,22 +9644,13 @@ msgstr "Bloker ikke længere" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Bloker ikke længere konto" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Bloker ikke længere konto?" @@ -10246,16 +9672,8 @@ msgstr "Fortryd deling" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Fortryd deling ({0, plural, one {# deling} other {# delinger}})" +msgstr "Fortryd deling ({0, plural, one {# deling} other {# delinger}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Følg ikke længere" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Følg ikke længer {0}" @@ -10287,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Fjern like" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Fjern ({0, plural, one {# like} other {# likes}})" @@ -10413,16 +9823,8 @@ msgstr "Abonnement på liste afmeldt" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Ikkeunderstøttet videotype: {mimeType}" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Uønsket seksuelt indhold" +msgstr "Ikkeunderstøttet videotype: {mimeType}<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10472,20 +9874,20 @@ msgstr "Upload en tekstfil til:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Upload fra kamera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Upload fra filer" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Upload fra bibliotek" @@ -10498,7 +9900,7 @@ msgstr "Uploader billeder..." msgid "Uploading link thumbnail..." msgstr "Uploader forhåndsvisning af link..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Uploader video..." @@ -10752,7 +10154,7 @@ msgstr "Video ikke fundet." msgid "Video settings" msgstr "Videoindstillinger" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video uploadet" @@ -10777,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Vis" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0}s avatar" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10803,15 +10209,10 @@ msgstr "Se blogpost for mere information" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Se loghændelse" +msgstr "Se loghændelse<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Læs mere" @@ -10847,10 +10248,6 @@ msgstr "Vis opslag" msgid "View profile" msgstr "Vis profil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Vis avataren" @@ -10894,15 +10291,10 @@ msgstr "Vis dine skjulte konti" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Se dine verifikationer" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Se dine verifikationer<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Viser hele billedet" @@ -10916,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11074,7 +10463,7 @@ msgstr "Beklager, men vi kunne ikke indlæse denne liste. Hvis problemet varer v msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Beklager, men vi kunne ikke indlæse dine skjulte ord. Prøv igen." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Beklager, men din søgning kunne ikke gennemføres. Prøv igen om lidt." @@ -11202,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Hvorfor skal denne bruger gennemgås?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 @@ -11641,11 +11026,7 @@ msgstr "Du er logget ind med en appadgangskode. Log ind med din primære adgangs #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Du har allerede klaget over denne mærkat, og vores moderatorteam er ved behandle sagen." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/de/messages.po b/src/locale/locales/de/messages.po index 9838c5803..76ae02f25 100644 --- a/src/locale/locales/de/messages.po +++ b/src/locale/locales/de/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {Follower} other {Follower}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {Folge ich} other {Folge ich}}" +msgstr "{0, plural, one {Folge ich} other {Folge ich}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {Gefällt mir} other {Gefällt mir}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {Post} other {Posts}}" +msgstr "{0, plural, one {Post} other {Posts}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {Zitat} other {Zitate}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {Repost} other {Reposts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {Zitat} other {Zitate}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {Repost} other {Reposts}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {Speicherung} other {Speicherungen}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# mehr}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Account)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} um {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Einloggen<1> oder <2>einen Account erstellen<3> <4>um nach Nachrichten, Sport, Politik und allem anderen zu suchen, was auf Bluesky passiert." @@ -587,11 +567,7 @@ msgstr "Über" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Missbräuchliches oder diskriminierendes Verhalten" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Barrierefreiheit" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Barrierefreiheitseinstellungen" +msgstr "Barrierefreiheitseinstellungen<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account" +msgstr "Account<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Account blockiert" @@ -669,26 +634,18 @@ msgstr "Account durch Liste stummgeschaltet" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Account-Optionen" +msgstr "Account-Optionen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Account-Anbieter" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Account aus dem Schnellzugriff entfernt" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Account entblockt" @@ -778,7 +735,7 @@ msgstr "Füge einen weiteren Account hinzu" msgid "Add another post" msgstr "Einen weiteren Post hinzufügen" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Einen weiteren Post zum Thread hinzufügen" @@ -889,20 +846,12 @@ msgstr "Für Erwachsene" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Inhalte für Erwachsene" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Inhalte für Erwachsene" @@ -919,10 +868,6 @@ msgstr "Inhalte für Erwachsene sind deaktiviert." msgid "Adult Content labels" msgstr "Kennzeichnungen für Inhalte für Erwachsene" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 -msgid "Adult sexual abuse content" -msgstr "Inhalte über sexuellen Missbrauch von Erwachsenen" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" msgstr "" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Eine Illustration, die zeigt, dass Bluesky vertrauenswürdige Verifizierer auswählt und diese wiederum einzelne Nutzeraccounts verifizieren." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Ein Problem, das hier nicht aufgelistet ist" @@ -1171,19 +1112,11 @@ msgstr "und" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Sexueller Missbrauch von Tieren" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Tierschutz" ->>>>>>> upstream/main +msgstr "Tierschutz>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Ankündigung" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Ankündigung der Verifizierung auf Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Asoziales Verhalten" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Ankündigung der Verifizierung auf Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Namen von App-Passwörtern müssen mindestens 4 Zeichen enthalten" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App-Passwörter" +msgstr "App-Passwörter<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "App-Passwörter" @@ -1307,19 +1225,12 @@ msgstr "Suspendierung anfechten" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Einspruch gegen diese Entscheidung" +msgstr "Einspruch gegen diese Entscheidung<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Erscheinungsbild" @@ -1331,23 +1242,14 @@ msgstr "Standardmäßig empfohlene Feeds anwenden" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Pull Request anwenden" +msgstr "Pull Request anwenden<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archiviert von {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archiviert von {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Archivierter Post" @@ -1416,18 +1318,11 @@ msgstr "Thema für den Algorithmus festlegen" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Mindestens 8 Zeichen" +msgstr "Mindestens 8 Zeichen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Verfügbar" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Verfügbar" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Zurück zu Chats" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Verbotene Aktivitäten oder Sicherheitsverstöße" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Zurückkehrender gesperrter Nutzer" ->>>>>>> upstream/main +msgstr "Zurückkehrender gesperrter Nutzer>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Beginne den Altersverifikationsprozess, indem du die folgenden Felder au #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Geburtstag" +msgstr "Geburtstag<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blockieren" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Account blockieren" @@ -1579,15 +1446,8 @@ msgstr "Accounts blockieren" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blockieren und löschen" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Diese Konversation blockieren und/oder löschen" +msgstr "Blockieren und löschen<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blockliste" @@ -1607,18 +1467,14 @@ msgstr "Nutzer blockieren" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Nutzer blockieren" +msgstr "Nutzer blockieren<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Nutzer blockieren und/oder diese Konversation löschen" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blockiert" @@ -1650,40 +1506,18 @@ msgstr "Die Blockierung ist öffentlich. Blockierte Accounts können nicht in de #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blockieren verhindert nicht, dass Kennzeichnungen zu deinem Account hinzugefügt werden, verhindert aber, dass dieser Account in deinen Threads antworten oder interagieren kann." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky kann die Echtheit des angegebenen Datums nicht bestätigen." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blockieren verhindert nicht, dass Kennzeichnungen zu deinem Account hinzugefügt werden, verhindert aber, dass dieser Account in deinen Threads antworten oder interagieren kann.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky kann die Echtheit des angegebenen Datums nicht bestätigen." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky ist ein offenes Netzwerk, bei dem du deinen Hosting-Anbieter auswählen kannst. Wenn du Entwickler bist, kannst du deinen eigenen Server hosten." @@ -1735,15 +1569,9 @@ msgstr "Bücher" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Verstoß gegen die Regeln der Website" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Finde weitere Accounts auf der Entdecken-Seite" @@ -1854,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Reaktivierung abbrechen und ausloggen" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Suche abbrechen" +msgstr "Suche abbrechen<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Kann nicht mit einem blockierten Nutzer interagieren" @@ -1955,11 +1771,7 @@ msgstr "Passwort ändern Dialog" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kategorie der Meldung ändern" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Chat-Anfragen" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Überprüfe deinen Posteingang auf eine E-Mail mit dem Bestätigungscode #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Kinderschutz" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Material zum sexuellen Missbrauch von Kindern (CSAM)" ->>>>>>> upstream/main +msgstr "Material zum sexuellen Missbrauch von Kindern (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Klipp 🐴 klapp 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Willkommensfenster schließen" msgid "Closes password update alert" msgstr "Schließt die Passwort-Update-Benachrichtigung" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Schließt den Post-Composer und verwirft den Post-Entwurf" @@ -2350,7 +2142,7 @@ msgstr "Verfasse Posts mit einer Länge von bis zu {0, plural, other {# Zeichen} msgid "Compose reply" msgstr "Antwort verfassen" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Video wird komprimiert..." @@ -2472,11 +2264,7 @@ msgstr "Inhalt nicht verfügbar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Inhalte, die Selbstverletzung fördern oder darstellen" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "DID des Autors kopieren" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiere den Code" +msgstr "Kopiere den Code<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID kopieren" @@ -2756,7 +2538,7 @@ msgstr "Account erstellen" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Einen Account erstellen" @@ -2817,35 +2599,16 @@ msgstr "Benutzerdefiniert" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Anpassungsoptionen" +msgstr "Anpassungsoptionen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Anpassen, wer mit diesem Post interagieren kann." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Passt dein Bluesky-Erlebnis individuell an" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Gefährliche Herausforderungen oder Aktivitäten" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Gefährliche Substanzen oder Drogenmissbrauch" @@ -2854,7 +2617,6 @@ msgstr "Gefährliche Substanzen oder Drogenmissbrauch" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Dunkel" @@ -2891,19 +2653,13 @@ msgstr "Debug-Panel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Deepfake-Inhalte für Erwachsene" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Standard" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Standardsymbole" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "E-Mail-2FA (Zwei-Faktor-Authentisierung) deaktivieren" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Haptische Rückmeldung deaktivieren" +msgstr "Haptische Rückmeldung deaktivieren<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Antworten vollständig deaktivieren>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Antworten vollständig deaktivieren" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Entdecke neue Feeds" msgid "Dismiss" msgstr "Verwerfen" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Fehler verwerfen" @@ -3271,11 +3014,8 @@ msgstr "Keine Sorge! Alle vorhandenen Nachrichten und Einstellungen werden gespe #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Bluesky herunterladen" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR-Datei herunterladen" +msgstr "CAR-Datei herunterladen<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Doxxing" ->>>>>>> upstream/main +msgstr "Doxxing>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "z. B. Nutzer, die wiederholt mit Werbung antworten." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Essstörungen" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Bearbeiten" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Avatar bearbeiten" @@ -3693,7 +3423,7 @@ msgstr "Vollbildmodus aktivieren" msgid "Entertainment" msgstr "Unterhaltung" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Fehler" @@ -3714,11 +3444,11 @@ msgstr "Fehlermeldung" msgid "Error occurred while saving file" msgstr "Beim Speichern der Datei ist ein Fehler aufgetreten" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Fehler beim Empfang der Captcha-Antwort." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Fehler: {error}" @@ -3740,19 +3470,8 @@ msgstr "Alle" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Alles andere" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Übermäßig viele Erwähnungen oder Antworten" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Übermäßige oder unerwünschte Nachrichten" +msgstr "Alles andere<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Nutzer ausschließen, denen du folgst" @@ -3876,11 +3595,7 @@ msgstr "Externe Medienpräferenzen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Extremistische Inhalte" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Fehler beim Überprüfen des Handles. Bitte versuche es erneut." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Fake-Account oder Bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Falsche Informationen über Wahlen" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feed" @@ -4241,26 +3946,8 @@ msgstr "Beenden" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Flaches Schwarz" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Flaches Blau" +msgstr "Fitness<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Flaches Weiß" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexibel" @@ -4271,16 +3958,7 @@ msgstr "Flexibel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Folgen" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Folgen" @@ -4323,16 +4001,8 @@ msgstr "Allen Accounts folgen" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Zurückfolgen" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Zurückfolgen" @@ -4372,13 +4042,9 @@ msgstr "Follower, die du kennst" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Folge ich" @@ -4386,16 +4052,11 @@ msgstr "Folge ich" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Folge ich" +msgstr "Folge ich<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0} Folge ich" @@ -4482,15 +4143,8 @@ msgstr "Vergessen?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Befreie deinen Feed" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Postet oft unerwünschte Inhalte" +msgstr "Befreie deinen Feed<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Von" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Gib deinem Profil ein Gesicht" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Eklatante Verstöße gegen Gesetze oder die Nutzungsbedingungen" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Verherrlichung von Gewalt" ->>>>>>> upstream/main +msgstr "Gib deinem Profil ein Gesicht<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Drastische Inhalte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Drastische Gewaltdarstellungen" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Grooming oder ausbeuterisches Verhalten" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking oder Systemangriffe" ->>>>>>> upstream/main +msgstr "Hacking oder Systemangriffe>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Haptik" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Belästigung, Trollen oder Intoleranz" -======= -msgstr "Belästigung oder Hass" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Schädliche oder riskante Aktivitäten" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Schädigung oder Gefährdung von Minderjährigen" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hassrede" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Du hast einen Code? <0>Hier klicken." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Hast du Probleme?" +msgstr "Hast du Probleme?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Anpassungsoptionen ausblenden" +msgstr "Anpassungsoptionen ausblenden<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Listen ausblenden" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Post für mich ausblenden" @@ -5015,11 +4613,7 @@ msgstr "Wie sollen wir diesen Link öffnen?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Menschenhandel" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Falls du ein Entwickler bist, kannst du deinen eigenen Server hosten." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Falls du versuchst, deinen Handle oder deine E-Mail zu ändern, tu dies, bevor du deinen Account deaktivierst." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegal und dringend" +msgstr "Falls du versuchst, deinen Handle oder deine E-Mail zu ändern, tu dies, bevor du deinen Account deaktivierst.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Bild" @@ -5113,29 +4699,15 @@ msgstr "Bild gespeichert" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Bilder können nur gespeichert werden, wenn der Zugriff auf deine Galerie erlaubt ist." +msgstr "Bilder können nur gespeichert werden, wenn der Zugriff auf deine Galerie erlaubt ist.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Vortäuschung einer Identität oder falsche Angaben zur Identität oder Zugehörigkeit" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Vortäuschung einer Identität, Fehlinformationen oder falsche Angaben" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Identitätsvortäuschung" ->>>>>>> upstream/main +msgstr "Identitätsvortäuschung>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "In-App, Push, alle" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "In-App, Push, Personen, denen du folgst" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Unangemessene Nachrichten oder explizite Links" +msgstr "In-App, Push, Personen, denen du folgst<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Gib das Passwort für die Account-Löschung ein" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Gib den Code ein, der dir per E-Mail zugeschickt wurde" +msgstr "Gib den Code ein, der dir per E-Mail zugeschickt wurde<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaktion eingeschränkt" @@ -5287,7 +4844,7 @@ msgstr "Im Moment ist es nur <0>{0}! Füge weitere Personen zu deinem Startp msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Hier bist gerade nur du! Füge mehr Leute zu deinem Startpaket hinzu, indem du oben nach ihnen suchst." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Job-ID: {0}" @@ -5330,17 +4887,13 @@ msgstr "Von {0} gekennzeichnet." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Vom Autor gekennzeichnet." +msgstr "Vom Autor gekennzeichnet.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Kennzeichnungen" @@ -5405,17 +4958,9 @@ msgstr "Mehr erfahren" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Mehr über die Altersverifikation erfahren" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Erfahre mehr über Bluesky (auf Englisch)" +msgstr "Mehr über die Altersverifikation erfahren<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Erfahre mehr über das Selbst-Hosting deiner PDS (auf Englisch)." @@ -5450,15 +4995,10 @@ msgstr "Erfahre mehr darüber, was auf Bluesky öffentlich ist (auf Englisch)." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Mehr dazu in deinen <0>Account-Einstellungen" +msgstr "Mehr dazu in deinen <0>Account-Einstellungen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Mehr erfahren." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Gefällt mir" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Gefällt mir ({0, plural, one {# Gefällt mir} other {# Gefällt mir}})" @@ -5589,13 +5125,9 @@ msgstr "„Gefällt mir“ für deine Reposts" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Mitteilungen über „Gefällt mir“-Angaben zu deinen Reposts" +msgstr "Mitteilungen über „Gefällt mir“-Angaben zu deinen Reposts<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "„Gefällt mir“-Angaben für diesen Post" @@ -5899,49 +5431,24 @@ msgstr "Nachrichtenoptionen" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Nachrichten" +msgstr "Nachrichten<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Mitternacht" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Belästigung oder Mobbing von Minderjährigen" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Sonstige Mitteilungen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Irreführender Account" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Irreführender Post" -======= -msgstr "Irreführend" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Moderationswerkzeuge" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Der Moderator hat sich entschieden, eine allgemeine Warnung für den Inhalt festzulegen." +msgstr "Der Moderator hat sich entschieden, eine allgemeine Warnung für den Inhalt festzulegen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mehr Feeds" @@ -6150,18 +5652,8 @@ msgstr "Meine Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Name" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Name oder Beschreibung verstößt gegen Gemeinschaftsstandards" - -======= ->>>>>>> upstream/main +msgstr "Name<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Kein Bild" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Noch keine „Gefällt mir“-Angaben" +msgstr "Noch keine „Gefällt mir“-Angaben<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} wird nicht mehr gefolgt" @@ -6386,7 +5873,7 @@ msgstr "Noch keine Nachrichten" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Schluss mit endlosem Doomscrolling und nutzlosen Algorithmen. Entdecke Feeds, die für dich arbeiten, nicht gegen dich." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Noch keine Mitteilungen!" @@ -6440,9 +5927,9 @@ msgstr "Keine Ergebnisse gefunden" msgid "No results found for \"{query}\"" msgstr "Keine Ergebnisse für \"{query}\" gefunden" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Keine Ergebnisse für {query} gefunden" @@ -6482,11 +5969,7 @@ msgstr "Niemand wurde gefunden. Versuche, nach jemand anderem zu suchen." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Intime Bilder ohne Einwilligung" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Jetzt" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nacktheit" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nacktheit oder Erwachseneninhalt nicht als solche gekennzeichnet" +msgstr "Nacktheit<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okay" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Seitenmenü öffnen" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Emoji-Picker öffnen" @@ -6815,7 +6287,7 @@ msgstr "Öffnet den Post-Editor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Öffnet die Gerätegalerie, um bis zu {MAX_IMAGES, plural, other {# Bilder}} oder ein einzelnes Video oder GIF auszuwählen." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Öffnet die Emoji-Auswahl" @@ -6855,15 +6327,10 @@ msgstr "Öffnet das Formular zum Zurücksetzen des Passworts" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Öffnet die Post-Spracheinstellungen" +msgstr "Öffnet die Post-Spracheinstellungen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Öffnet dieses Profil" @@ -6897,12 +6364,7 @@ msgstr "OTA-Status: Kein Update verfügbar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Andere" @@ -6912,35 +6374,8 @@ msgstr "Anderer Account" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Sonstiges Kinderschutzproblem" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Sonstige gefährliche Inhalte" @@ -6963,8 +6398,7 @@ msgstr "Sonstige Inhalte zu sexueller Gewalt" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Sonstige gewalttätige Inhalte" ->>>>>>> upstream/main +msgstr "Sonstige gewalttätige Inhalte>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Personen, die @{0} folgen" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Personen, denen ich folge" +msgstr "Personen, denen ich folge<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Personen, denen du folgst" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Personen, die du erwähnst" +msgstr "Personen, die du erwähnst>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Zugriff auf deine Galerie wurde verweigert. Bitte aktiviere ihn in deinen Systemeinstellungen." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Posten" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Alle posten" @@ -7341,19 +6768,12 @@ msgstr "Post gelöscht" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Fehler beim Hochladen des Posts. Bitte prüfe deine Internetverbindung und versuche es erneut." +msgstr "Fehler beim Hochladen des Posts. Bitte prüfe deine Internetverbindung und versuche es erneut.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Post wurde gelöscht" @@ -7487,13 +6907,9 @@ msgstr "Datenschutzerklärung" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Verletzung der Privatsphäre eines Minderjährigen" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Video wird verarbeitet..." @@ -7521,15 +6937,11 @@ msgstr "Profil aktualisiert" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Werbung oder Verkauf verbotener Gegenstände oder Dienstleistungen" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! Du kannst bearbeiten, wer mit diesem Post interagieren darf." ->>>>>>> upstream/main +msgstr "Psst! Du kannst bearbeiten, wer mit diesem Post interagieren darf.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Öffentliche, teilbare Listen, die verwendet werden können, um Feeds zu steuern." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Post veröffentlichen" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Posts veröffentlichen" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Antworten veröffentlichen" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Antwort veröffentlichen" @@ -7622,13 +7034,9 @@ msgstr "Zitate deaktiviert" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Zitate" +msgstr "Zitate<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Zitate dieses Posts" @@ -7689,12 +7097,12 @@ msgstr "Bluesky-Nutzungsbedingungen lesen" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Anhang entfernen" msgid "Remove Avatar" msgstr "Avatar entfernen" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Banner entfernen" @@ -7960,17 +7368,13 @@ msgstr "Antworten deaktiviert" msgid "Replies to this post are disabled." msgstr "Antworten zu diesem Post sind deaktiviert." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Antworten" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Antworten ({0, plural, one {# Antwort} other {# Antworten}})" @@ -8060,11 +7464,7 @@ msgstr "Meldung eingereicht" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Diese Konversation melden" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Repostet von dir" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts" +msgstr "Reposts<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Reposts von diesem Post" @@ -8214,17 +7610,13 @@ msgstr "Onboardingstatus zurücksetzen" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Passwort zurücksetzen" +msgstr "Passwort zurücksetzen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Erneuter Versuch, sich einzuloggen" @@ -8377,28 +7769,21 @@ msgstr "Sag Hallo!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Betrug" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wissenschaft" +msgstr "Wissenschaft<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Nach links scrollen" @@ -8443,11 +7828,11 @@ msgstr "Suche nach „{interestsDisplayName}“" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Suche nach „{interestsDisplayName}“ (aktiv)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Nach \"{query}\" suchen" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Suche nach „{searchText}“" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Suche nach GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Suche ist derzeit nicht verfügbar, wenn du ausgeloggt bist" @@ -8565,11 +7950,7 @@ msgstr "Wähle eine Farbe" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Einen Grund auswählen" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "Das Auswählen mehrerer Medientypen wird nicht unterstützt." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Selbstverletzendes oder gefährliches Verhalten" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Geburtsdatum festlegen" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Neues Passwort festlegen" +msgstr "Neues Passwort festlegen<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Richte deinen Account ein" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Antworten anzeigen" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Antworten anzeigen als" +msgstr "Antworten anzeigen als<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Antwort für alle anzeigen" @@ -9062,13 +8423,9 @@ msgstr "Warnung zeigen" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Warnung anzeigen und aus Feeds filtern" +msgstr "Warnung anzeigen und aus Feeds filtern<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Zeigt Informationen darüber an, wann dieser Post erstellt wurde" @@ -9089,7 +8446,7 @@ msgstr "Zeigt den Inhalt an" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Quelle: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; übermäßige Erwähnungen oder Antworten" -======= -msgstr "Spam oder sonstiges unechtes Verhalten bzw. Täuschung" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Vorgeschlagen für dich" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestiv" +msgstr "Suggestiv<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Sonnenaufgang" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Sonnenuntergang" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Tippe, um zu schließen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Gezielte Belästigung" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Bedingungen" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Nutzungsbedingungen" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Verwendete Begriffe verstoßen gegen die Community-Richtlinien" - -======= ->>>>>>> upstream/main +msgstr "Nutzungsbedingungen<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Text & Tags" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "Das ist alles!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Nach dem Entblocken kann der Account wieder mit dir interagieren." @@ -9803,17 +9115,12 @@ msgstr "Beim Kontaktieren des Servers ist ein Problem aufgetreten" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Beim Kontaktieren des Servers ist ein Problem aufgetreten. Bitte überprüfe deine Internetverbindung und versuche es erneut." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Beim Abrufen von Mitteilung ist ein Problem aufgetreten. Tippe hier, um es erneut zu versuchen." +msgstr "Beim Abrufen von Mitteilung ist ein Problem aufgetreten. Tippe hier, um es erneut zu versuchen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Beim Abrufen von Posts ist ein Problem aufgetreten. Tippe hier, um es erneut zu versuchen." @@ -9852,16 +9159,9 @@ msgstr "Beim Aktualisieren deiner Feeds ist ein Problem aufgetreten. Bitte über #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Bei der Anwendung ist ein unerwartetes Problem aufgetreten. Bitte teile #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Es gab einen Ansturm neuer Nutzer auf Bluesky! Wir werden deinen Account so schnell wie möglich aktivieren." +msgstr "Es gab einen Ansturm neuer Nutzer auf Bluesky! Wir werden deinen Account so schnell wie möglich aktivieren.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Das sind deine Standardeinstellungen" ->>>>>>> upstream/main +msgstr "Das sind deine Standardeinstellungen>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Diese Liste ist leer." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Dieser Moderationsdienst ist nicht verfügbar. Siehe unten für weitere Details. Wenn das Problem weiterhin besteht, kontaktiere uns." +msgstr "Dieser Moderationsdienst ist nicht verfügbar. Siehe unten für weitere Details. Wenn das Problem weiterhin besteht, kontaktiere uns.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Dieser Post soll am <0>{0} erstellt worden sein, wurde aber erstmals von Bluesky am <1>{1} gesehen." @@ -10179,11 +9469,7 @@ msgstr "Thread-Einstellungen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Drohungen oder Aufstachelung" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Thema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Übersetzen" @@ -10262,11 +9541,7 @@ msgstr "Angesagte Videos" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Entblocken" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Account entblocken" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Account entblocken?" @@ -10406,16 +9672,8 @@ msgstr "Repost rückgängig machen" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Repost rückgängig machen ({0, plural, one {# Repost} other {# Reposts}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Entfolgen" +msgstr "Repost rückgängig machen ({0, plural, one {# Repost} other {# Reposts}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} entfolgen" @@ -10443,32 +9701,18 @@ msgstr "Unbekannter Verifizierer" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Nicht gekennzeichnete Inhalte für Erwachsene" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Nicht gekennzeichnete, missbräuchliche oder nicht einvernehmliche Inhalte für Erwachsene" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Gefällt mir nicht mehr" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Gefällt mir nicht mehr ({0, plural, one {# Gefällt mir} other {# Gefällt mir}})" @@ -10579,16 +9823,8 @@ msgstr "Von der Liste abgemeldet" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Nicht unterstützter Videotyp: {mimeType}" +msgstr "Nicht unterstützter Videotyp: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Unerwünschter sexueller Inhalt" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Hochladen einer Textdatei auf:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Von Kamera hochladen" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Von Dateien hochladen" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Aus der Bibliothek hochladen" @@ -10664,7 +9900,7 @@ msgstr "Bilder werden hochgeladen..." msgid "Uploading link thumbnail..." msgstr "Link-Vorschaubild wird hochgeladen..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Video wird hochgeladen..." @@ -10918,7 +10154,7 @@ msgstr "Video nicht gefunden." msgid "Video settings" msgstr "Video-Einstellungen" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video hochgeladen" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Ansehen" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Avatar von {0} ansehen" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Blogpost für weitere Details ansehen" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-Eintrag anzeigen" +msgstr "Debug-Eintrag anzeigen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Details ansehen" @@ -11013,10 +10248,6 @@ msgstr "Post ansehen" msgid "View profile" msgstr "Profil ansehen" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Avatar ansehen" @@ -11060,15 +10291,10 @@ msgstr "Sieh dir deine stummgeschalteten Accounts an" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Deine Verifizierungen ansehen" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Deine Verifizierungen ansehen<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Vollständiges Bild ansehen" @@ -11078,24 +10304,16 @@ msgstr "Zeigt Video im immersiven Modus" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Gewalttätige oder bedrohliche Inhalte>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Gewalt" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Gewalttätige oder bedrohliche Inhalte" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Es tut uns leid, aber wir konnten diese Liste nicht auflösen. Wenn das msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Es tut uns leid, aber wir konnten deine stummgeschalteten Wörter gerade nicht laden. Bitte versuche es erneut." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Es tut uns leid, aber deine Suche konnte nicht abgeschlossen werden. Bitte versuche es in ein paar Minuten noch einmal." @@ -11346,11 +10564,7 @@ msgstr "Warum legst du Widerspruch ein?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Warum sollte diese Konversation überprüft werden?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Warum sollte dieser Nutzer überprüft werden?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Möchtest du diesen Nutzer blockieren und/oder diese Konversation löschen?" ->>>>>>> upstream/main +msgstr "Möchtest du diesen Nutzer blockieren und/oder diese Konversation löschen?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Du bist mit einem App-Passwort eingeloggt. Bitte logge dich mit deinem H #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Du hast gegen diese Kennzeichnung bereits einen Einspruch eingelegt, welcher derzeit von unserem Moderationsteam überprüft wird." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/el/messages.po b/src/locale/locales/el/messages.po index 80e018d24..72bd8e8c2 100644 --- a/src/locale/locales/el/messages.po +++ b/src/locale/locales/el/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {ακόλουθος} other {ακόλουθοι}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {ακολουθεί} other {ακολουθούν}}" +msgstr "{0, plural, one {ακολουθεί} other {ακολουθούν}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {Μου αρέσει} other {Μου αρέσει}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {ανάρτηση} other {αναρτήσεις}}" +msgstr "{0, plural, one {ανάρτηση} other {αναρτήσεις}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {πάραθεση} other {παραθέσεις}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {αναδημοσίευση} other {αναδημοσιεύσεις}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {πάραθεση} other {παραθέσεις}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {αναδημοσίευση} other {αναδημοσιεύσεις}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} στις {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Προσβασιμότητα" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ρυθμίσεις Προσβασιμότητας" +msgstr "Ρυθμίσεις Προσβασιμότητας<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Λογαριασμός" +msgstr "Λογαριασμός<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Λογαριασμός μπλοκαρισμένος" @@ -661,26 +634,18 @@ msgstr "Λογαριασμός σε σίγαση από λίστα" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Επιλογές λογαριασμού" +msgstr "Επιλογές λογαριασμού<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Λογαριασμός αφαιρέθηκε από την γρήγορη πρόσβαση" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Λογαριασμός ξεμπλοκαρισμένος" @@ -770,7 +735,7 @@ msgstr "Προσθήκη άλλου λογαριασμού" msgid "Add another post" msgstr "Προσθήκη άλλης ανάρτησης" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Περιεχόμενο για ενηλίκους" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Ένα θέμα που δεν περιλαμβάνεται σε αυτές τις επιλογές" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Αντικοινωνική Συμπεριφορά" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Τα ονόματα κωδικών πρόσβασης εφαρμογής #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Κωδικοί πρόσβασης εφαρμογής" +msgstr "Κωδικοί πρόσβασης εφαρμογής<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Κωδικοί Πρόσβασης Εφαρμογής" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Εφεση σε αυτήν την απόφαση" +msgstr "Εφεση σε αυτήν την απόφαση<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Εμφάνιση" @@ -1307,23 +1242,14 @@ msgstr "Εφαρμογή προεπιλεγμένων προτεινόμενων #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Αρχειοθετήθηκε από {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Αρχειοθετήθηκε από {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Αρχειοθετημένη ανάρτηση" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Ημερομηνία γέννησης" +msgstr "Ημερομηνία γέννησης<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Αποκλεισμός" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Αποκλεισμός λογαριασμού" @@ -1546,15 +1446,8 @@ msgstr "Αποκλεισμός λογαριασμών" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Αποκλεισμός και/ή διαγραφή αυτής της συνομιλίας" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Λίστα αποκλεισμένων" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Αποκλεισμένος" @@ -1617,40 +1506,18 @@ msgstr "Ο αποκλεισμός είναι δημόσιος. Οι αποκλε #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Ο αποκλεισμός δεν θα εμποδίσει την εφαρμογή ετικετών στον λογαριασμό σας, αλλά θα σταματήσει αυτόν τον λογαριασμό από το να απαντά στις συζητήσεις σας ή να αλληλεπιδρά μαζί σας." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Το Bluesky δεν μπορεί να επιβεβαιώσει την αυθεντικότητα της ημερομηνίας που δηλώθηκε." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Ιστολόγιο" +msgstr "Ο αποκλεισμός δεν θα εμποδίσει την εφαρμογή ετικετών στον λογαριασμό σας, αλλά θα σταματήσει αυτόν τον λογαριασμό από το να απαντά στις συζητήσεις σας ή να αλληλεπιδρά μαζί σας.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Το Bluesky δεν μπορεί να επιβεβαιώσει την αυθεντικότητα της ημερομηνίας που δηλώθηκε." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Το Bluesky είναι ένα ανοιχτό δίκτυο όπου μπορείτε να επιλέξετε τον πάροχο φιλοξενίας σας. Αν είστε προγραμματιστής, μπορείτε να φιλοξενήσετε τον δικό σας διακομιστή." @@ -1702,13 +1569,9 @@ msgstr "Βιβλία" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Περιηγηθείτε σε περισσότερους λογαριασμούς στην σελίδα Εξερεύνησης" @@ -1819,19 +1682,13 @@ msgstr "Κάμερα" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Ακύρωση αναζήτησης" +msgstr "Ακύρωση αναζήτησης<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Δεν μπορείτε να αλληλεπιδράσετε με έναν μπλοκαρισμένο χρήστη" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Κλείνει την ειδοποίηση ενημέρωσης κωδικού πρόσβασης" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Σύνταξη απάντησης" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Συμπίεση βίντεο..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Αντιγραφή κωδικού" +msgstr "Αντιγραφή κωδικού<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Αντιγραφή DID" @@ -2705,7 +2538,7 @@ msgstr "Δημιουργία Λογαριασμού" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Δημιουργία λογαριασμού" @@ -2766,15 +2599,8 @@ msgstr "Προσαρμοσμένο" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Προσαρμόστε ποιος μπορεί να αλληλεπιδράσει με αυτήν την ανάρτηση." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Σκοτεινό" @@ -2834,17 +2653,13 @@ msgstr "Πίνακας Debug" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Προεπιλογή" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Απενεργοποίηση Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Απενεργοποίηση ανάδρασης αφής" +msgstr "Απενεργοποίηση ανάδρασης αφής<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Ανακαλύψτε Νέες Ροές" msgid "Dismiss" msgstr "Απόρριψη" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Απόρριψη σφάλματος" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Κατεβάστε το Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Κατεβάστε το αρχείο CAR" +msgstr "Κατεβάστε το αρχείο CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Επεξεργασία" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Επεξεργασία εικόνας προφίλ" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Σφάλμα" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Σφάλμα λήψης απάντησης captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Όλοι" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Υπερβολικές αναφορές ή απαντήσεις" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Υπερβολικά ή ανεπιθύμητα μηνύματα" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Αποκλεισμός χρηστών που ακολουθείτε" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Ροή" @@ -4164,26 +3946,8 @@ msgstr "Τέλος" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Φυσική κατάσταση" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Φυσική κατάσταση<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Ευέλικτο" @@ -4194,16 +3958,7 @@ msgstr "Ευέλικτο" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Ακολουθήστε" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Ακολουθήστε" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Κάντε follow back" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Κάντε follow back" @@ -4295,13 +4042,9 @@ msgstr "Ακολούθοι που γνωρίζετε" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Ακολουθείτε" @@ -4309,16 +4052,11 @@ msgstr "Ακολουθείτε" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Ακολουθείτε" +msgstr "Ακολουθείτε<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Ακολουθείτε {0}" @@ -4405,15 +4143,8 @@ msgstr "Ξεχάσατε;" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Συχνά δημοσιεύει ανεπιθύμητο περιεχόμενο" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Δώστε στο προφίλ σας ένα πρόσωπο" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Φανοφανείς παραβιάσεις του νόμου ή των όρων παροχής υπηρεσιών" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Δώστε στο προφίλ σας ένα πρόσωπο<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Απτικές αντιδράσεις" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Παρενοχλήσεις, τρολάρισμα ή μισαλλοδοξία" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Έχετε πρόβλημα;" +msgstr "Έχετε πρόβλημα;<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Απόκρυψη ανάρτησης για μένα" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Εάν προσπαθείτε να αλλάξετε το όνομα χρήστη ή το email σας, κάντε το πριν απενεργοποιήσετε τον λογαριασμό σας." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Παράνομο και Επείγον" +msgstr "Εάν προσπαθείτε να αλλάξετε το όνομα χρήστη ή το email σας, κάντε το πριν απενεργοποιήσετε τον λογαριασμό σας.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Εικόνα" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Παραποίηση ή ψευδείς ισχυρισμοί σχετικά με την ταυτότητα ή τη σχέση" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Παραποίηση, παραπληροφόρηση ή ψευδείς ισχυρισμοί" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Ανάρμοστα μηνύματα ή ακατάλληλοι σύνδεσμοι" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Εισαγάγετε τον κωδικό πρόσβασης για δι #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Εισαγάγετε τον κωδικό που σας στάλθηκε μέσω email" +msgstr "Εισαγάγετε τον κωδικό που σας στάλθηκε μέσω email<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Περιορισμένη αλληλεπίδραση" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Είστε μόνοι σας αυτή τη στιγμή! Προσθέστε περισσότερους ανθρώπους στο starter pack σας κάνοντας αναζήτηση παραπάνω." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID εργασίας: {0}" @@ -5231,17 +4887,13 @@ msgstr "Επισημασμένο από {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Επισημασμένο από τον/την συγγραφέα." +msgstr "Επισημασμένο από τον/την συγγραφέα.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Ετικέτες" @@ -5306,17 +4958,9 @@ msgstr "Μάθετε περισσότερα" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Μάθετε περισσότερα για το Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Μάθετε περισσότερα για την αυτόνομη φιλοξενία του PDS σας." @@ -5351,15 +4995,10 @@ msgstr "Μάθετε περισσότερα για το τι είναι δημό #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Μάθετε περισσότερα." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "\"Μου αρέσει\" σε αυτήν την ανάρτηση" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Μηνύματα" +msgstr "Μηνύματα<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Παραπλανητικός Λογαριασμός" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Παραπλανητική Δημοσίευση" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Εργαλεία διαχείρισης" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Ο/η διαχειριστής επέλεξε να θέσει μια γενική προειδοποίηση στο περιεχόμενο." +msgstr "Ο/η διαχειριστής επέλεξε να θέσει μια γενική προειδοποίηση στο περιεχόμενο.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Περισσότερες ροές" @@ -6047,18 +5652,8 @@ msgstr "Οι Ροές μου" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Όνομα" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Το όνομα ή η περιγραφή παραβιάζει τους κανόνες της κοινότητας" - -======= ->>>>>>> upstream/main +msgstr "Όνομα<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Δεν υπάρχουν ακόμη \"Μου αρέσει\"" +msgstr "Δεν υπάρχουν ακόμη \"Μου αρέσει\"<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Δεν ακολουθώ πλέον τον {0}" @@ -6283,7 +5873,7 @@ msgstr "Δεν υπάρχουν ακόμη μηνύματα" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Δεν υπάρχουν ακόμη ειδοποιήσεις!" @@ -6337,9 +5927,9 @@ msgstr "Δεν βρέθηκαν αποτελέσματα" msgid "No results found for \"{query}\"" msgstr "Δεν βρέθηκαν αποτελέσματα για “{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Δεν βρέθηκαν αποτελέσματα για {query}" @@ -6474,15 +6064,8 @@ msgstr "Τώρα" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Γύμνια" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Γυμνότητα ή περιεχόμενο για ενήλικες που δεν έχει επισημανθεί ως τέτοιο" +msgstr "Γύμνια<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Εντάξει" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Άνοιγμα επιλογέα emoji" @@ -6708,7 +6287,7 @@ msgstr "Ανοίγει το εργαλείο σύνταξης κειμένου" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "Ανοίγει τη φόρμα επαναφοράς κωδικού πρ #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Ανοίγει αυτό το προφίλ" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Άλλο" @@ -6905,23 +6474,16 @@ msgstr "Άτομα που ακολουθούνται από τον/την @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Δημοσίευση" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Δημοσίευση" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Δημοσίευση Όλων" @@ -7206,19 +6768,12 @@ msgstr "Η δημοσίευση διαγράφηκε" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Η δημοσίευση απέτυχε να μεταφορτωθεί. Παρακαλώ ελέγξτε τη σύνδεση στο internet και προσπαθήστε ξανά." +msgstr "Η δημοσίευση απέτυχε να μεταφορτωθεί. Παρακαλώ ελέγξτε τη σύνδεση στο internet και προσπαθήστε ξανά.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "Πολιτική Απορρήτου" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Επεξεργασία βίντεο..." @@ -7382,19 +6937,12 @@ msgstr "Προφίλ ενημερωμένο" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Δημόσιο" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Οι παραθέσεις δημοσιεύσεων είναι απενε #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Παραθέσεις" +msgstr "Παραθέσεις<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Παραθέσεις αυτής της δημοσίευσης" @@ -7553,12 +7097,12 @@ msgstr "Διαβάστε τους Όρους Χρήσης του Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Αφαίρεση συνημμένου" msgid "Remove Avatar" msgstr "Αφαίρεση φωτογραφίας προφίλ" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "" @@ -7824,17 +7368,13 @@ msgstr "Οι απαντήσεις είναι απενεργοποιημένες" msgid "Replies to this post are disabled." msgstr "Οι απαντήσεις σε αυτή τη δημοσίευση είναι απενεργοποιημένες." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Απάντηση" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "Αναδημοσίευση από εσάς" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Αναδημοσίευση αυτής της ανάρτησης" @@ -8074,17 +7610,13 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Επαναφορά κωδικού πρόσβασης" +msgstr "Επαναφορά κωδικού πρόσβασης<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Επιστήμη" +msgstr "Επιστήμη<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Αναζήτησή για “{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Αναζήτησή για “{searchText}”" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Αναζήτηση GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Ορισμός ημερομηνίας γέννησης" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ορισμός νέου κωδικού πρόσβασης" +msgstr "Ορισμός νέου κωδικού πρόσβασης<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Ρύθμιση του λογαριασμού σας" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Εμφάνιση απαντήσεων" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Εμφάνιση απάντησης για όλους" @@ -8910,13 +8423,9 @@ msgstr "Εμφάνιση προειδοποίησης" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Εμφάνιση προειδοποίησης και φιλτράρισμα από τις ροές" +msgstr "Εμφάνιση προειδοποίησης και φιλτράρισμα από τις ροές<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; υπερβολικές αναφορές ή απαντήσεις" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Προτεινόμενα για εσάς" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Προκλητικό" +msgstr "Προκλητικό<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Όροι" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Όροι Χρήσης" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Οι όροι που χρησιμοποιούνται παραβιάζουν τους κανόνες της κοινότητας" - -======= ->>>>>>> upstream/main +msgstr "Όροι Χρήσης<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Κείμενο & ετικέτες" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Ο λογαριασμός θα μπορεί να αλληλεπιδράσει μαζί σας μετά την απελευθέρωση." @@ -9646,17 +9115,12 @@ msgstr "Παρουσιάστηκε πρόβλημα επικοινωνίας μ msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Παρουσιάστηκε πρόβλημα επικοινωνίας με τον διακομιστή, παρακαλούμε ελέγξτε τη σύνδεσή σας στο internet και δοκιμάστε ξανά." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Παρουσιάστηκε πρόβλημα λήψης ειδοποιήσεων. Πατήστε εδώ για να δοκιμάσετε ξανά." +msgstr "Παρουσιάστηκε πρόβλημα λήψης ειδοποιήσεων. Πατήστε εδώ για να δοκιμάσετε ξανά.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Παρουσιάστηκε πρόβλημα λήψης αναρτήσεων. Πατήστε εδώ για να δοκιμάσετε ξανά." @@ -9695,16 +9159,9 @@ msgstr "Παρουσιάστηκε πρόβλημα κατά την ενημέρ #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "Παρουσιάστηκε ένα απροσδόκητο πρόβλημ #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Υπήρξε μια έξαρση νέων χρηστών στο Bluesky! Θα ενεργοποιήσουμε τον λογαριασμό σας το συντομότερο δυνατόν." +msgstr "Υπήρξε μια έξαρση νέων χρηστών στο Bluesky! Θα ενεργοποιήσουμε τον λογαριασμό σας το συντομότερο δυνατόν.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Η υπηρεσία διαχείρισης δεν είναι διαθέσιμη. Δείτε παρακάτω για περισσότερες λεπτομέρειες. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας." +msgstr "Η υπηρεσία διαχείρισης δεν είναι διαθέσιμη. Δείτε παρακάτω για περισσότερες λεπτομέρειες. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "" @@ -10071,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Μετάφραση" @@ -10203,22 +9644,13 @@ msgstr "Ξεμπλοκάρισμα" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Ξεμπλοκάρισμα λογαριασμού" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Ξεμπλοκάρισμα Λογαριασμού;" @@ -10240,16 +9672,8 @@ msgstr "Αναίρεση αναδημοσίευσης" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Διακοπή παρακολούθησης" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Διακοπή παρακολούθησης {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "Απεγγραφή από αυτήν την λίστα" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Ανεπιθύμητο Σεξουαλικό Περιεχόμενο" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Ανεβάστε ένα αρχείο κειμένου στο:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Ανεβάστε από την κάμερα" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Ανεβάστε από αρχεία" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Ανεβάστε από τη βιβλιοθήκη" @@ -10492,7 +9900,7 @@ msgstr "Ανεβάζω εικόνες..." msgid "Uploading link thumbnail..." msgstr "Ανεβάζω μικρογραφία συνδέσμου..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Ανεβάζω βίντεο..." @@ -10746,7 +10154,7 @@ msgstr "Το βίντεο δεν βρέθηκε." msgid "Video settings" msgstr "Ρυθμίσεις βίντεο" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Το βίντεο ανέβηκε" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Προβολή εικόνας προφίλ του/της {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Δείτε την ανάρτηση ιστολογίου για περι #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Προβολή καταχώρησης εντοπισμού σφαλμάτων" +msgstr "Προβολή καταχώρησης εντοπισμού σφαλμάτων<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Προβολή λεπτομερειών" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Προβολή προφίλ" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Προβολή της εικόνας προφίλ" @@ -10888,15 +10291,10 @@ msgstr "Προβολή των λογαριασμών που έχετε σε σί #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Λυπούμαστε, αλλά δεν μπορέσαμε να επιλύ msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Λυπούμαστε, αλλά δεν μπορέσαμε να φορτώσουμε τις λέξεις που έχετε σε σίγαση αυτήν τη στιγμή. Παρακαλώ προσπαθήστε ξανά." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Λυπούμαστε, αλλά η αναζήτησή σας δεν μπόρεσε να ολοκληρωθεί. Παρακαλώ προσπαθήστε ξανά σε λίγα λεπτά." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Γιατί πρέπει να ελεγχθεί αυτός ο χρήστης;" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/en-GB/messages.po b/src/locale/locales/en-GB/messages.po index 3d7d36127..823afa598 100644 --- a/src/locale/locales/en-GB/messages.po +++ b/src/locale/locales/en-GB/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {follower} other {followers}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {following} other {following}}" +msgstr "{0, plural, one {following} other {following}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {like} other {likes}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {post} other {posts}}" +msgstr "{0, plural, one {post} other {posts}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {quote} other {quotes}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repost} other {reposts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {quote} other {quotes}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repost} other {reposts}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {save} other {saves}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# more}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Account)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} at {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics and everything else happening on Bluesky." @@ -587,11 +567,7 @@ msgstr "About" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Abusive or discriminatory behaviour" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Accessibility" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Accessibility Settings" +msgstr "Accessibility Settings<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account" +msgstr "Account<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Account blocked" @@ -669,26 +634,18 @@ msgstr "Account Muted by List" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Account options" +msgstr "Account options<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Account provider" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Account removed from quick access" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Account unblocked" @@ -778,7 +735,7 @@ msgstr "Add another account" msgid "Add another post" msgstr "Add another post" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Add another post to thread" @@ -889,20 +846,12 @@ msgstr "Adult" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Adult content" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Adult Content" @@ -921,11 +870,7 @@ msgstr "Adult Content labels" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Adult sexual abuse content" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "An illustration showing that Bluesky selects trusted verifiers, and trusted verifiers in turn verify individual user accounts." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "An issue not included in these options" @@ -1171,19 +1112,11 @@ msgstr "and" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "" -======= -msgstr "Animal sexual abuse" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" -msgstr "Animal welfare" ->>>>>>> upstream/main +msgstr "Animal welfare>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Announcement" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Announcing verification on Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Anti-Social Behaviour" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Announcing verification on Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Anyone" ->>>>>>> upstream/main +msgstr "Anyone>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "App password names must be at least 4 characters long" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App passwords" +msgstr "App passwords<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "App Passwords" @@ -1307,19 +1225,12 @@ msgstr "Appeal Suspension" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Appeal this decision" +msgstr "Appeal this decision<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Appearance" @@ -1331,23 +1242,14 @@ msgstr "Apply default recommended feeds" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Apply Pull Request" +msgstr "Apply Pull Request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archived from {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archived from {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Archived post" @@ -1416,18 +1318,11 @@ msgstr "Assign topic for algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "At least 8 characters" +msgstr "At least 8 characters<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Available" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Available" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Back to Chats" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Banned activities or security violations" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Banned user returning" ->>>>>>> upstream/main +msgstr "Banned user returning>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Begin the age assurance process by completing the fields below." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Birthday" +msgstr "Birthday<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Block" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Block account" @@ -1579,15 +1446,8 @@ msgstr "Block accounts" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Block and Delete" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Block and/or delete this conversation" +msgstr "Block and Delete<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Block list" @@ -1607,18 +1467,14 @@ msgstr "Block user" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Block User" +msgstr "Block User<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Block user and/or delete this conversation" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blocked" @@ -1650,40 +1506,18 @@ msgstr "Blocking is public. Blocked accounts cannot reply in your threads, menti #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky cannot confirm the authenticity of the claimed date." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky cannot confirm the authenticity of the claimed date." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." @@ -1735,15 +1569,9 @@ msgstr "Books" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Breaking site rules" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Browse more accounts on the Explore page" @@ -1854,19 +1682,13 @@ msgstr "Camera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Cancel reactivation and sign out" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancel search" +msgstr "Cancel search<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Cannot interact with a blocked user" @@ -1955,11 +1771,7 @@ msgstr "Change password dialog" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Change report category" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Chat requests" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Check your inbox for an email with the confirmation code to enter below: #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Child safety" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Child Sexual Abuse Material (CSAM)" ->>>>>>> upstream/main +msgstr "Child Sexual Abuse Material (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Close welcome modal" msgid "Closes password update alert" msgstr "Closes password update alert" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Closes post composer and discards post draft" @@ -2350,7 +2142,7 @@ msgstr "Compose posts up to {0, plural, other {# characters}} in length" msgid "Compose reply" msgstr "Compose reply" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Compressing video..." @@ -2472,11 +2264,7 @@ msgstr "Content Not Available" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Content promoting or depicting self-harm" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copy author DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copy code" +msgstr "Copy code<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copy DID" @@ -2756,7 +2538,7 @@ msgstr "Create Account" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Create an account" @@ -2817,35 +2599,16 @@ msgstr "Custom" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Customisation options" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Customise who can interact with this post." +msgstr "Customisation options<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Customises your Bluesky experience" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Dangerous challenges or activities" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Dangerous substances or drug abuse" @@ -2854,7 +2617,6 @@ msgstr "Dangerous substances or drug abuse" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Dark" @@ -2891,19 +2653,13 @@ msgstr "Debug panel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Deepfake adult content" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Default" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Default icons" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Disable Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Disable haptic feedback" +msgstr "Disable haptic feedback<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Disable replies entirely>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Disable replies entirely" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Discover New Feeds" msgid "Dismiss" msgstr "Dismiss" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Dismiss error" @@ -3271,11 +3014,8 @@ msgstr "Don't worry! All existing messages and settings are saved and will be av #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Download Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Download CAR file" +msgstr "Download CAR file<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Doxxing" ->>>>>>> upstream/main +msgstr "Doxxing>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "e.g. Users that repeatedly reply with ads." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Eating disorders" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Edit" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Edit avatar" @@ -3693,7 +3423,7 @@ msgstr "Enters fullscreen" msgid "Entertainment" msgstr "Entertainment" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3714,11 +3444,11 @@ msgstr "Error message" msgid "Error occurred while saving file" msgstr "Error occurred while saving file" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error receiving captcha response." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Error: {error}" @@ -3740,19 +3470,8 @@ msgstr "Everyone" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Everything else" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Excessive mentions or replies" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Excessive or unwanted messages" +msgstr "Everything else<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Exclude users you follow" @@ -3876,11 +3595,7 @@ msgstr "External Media Preferences" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Extremist content" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Failed to verify handle. Please try again." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Fake account or bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "False information about elections" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feed" @@ -4241,26 +3946,8 @@ msgstr "Finish" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" +msgstr "Fitness<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Flat Black" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Flat Blue" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Flat White" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4271,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Follow" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Follow" @@ -4323,16 +4001,8 @@ msgstr "Follow all accounts" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Follow back" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Follow back" @@ -4372,13 +4042,9 @@ msgstr "Followers you know" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Following" @@ -4386,16 +4052,11 @@ msgstr "Following" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Following" +msgstr "Following<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Following {0}" @@ -4482,15 +4143,8 @@ msgstr "Forgot?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Free your feed" +msgstr "Free your feed<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Frequently Posts Unwanted Content" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "From" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Give your profile a face" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Glaring violations of law or terms of service" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorification of violence" ->>>>>>> upstream/main +msgstr "Give your profile a face<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,18 +4356,7 @@ msgstr "Graphic Media" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "Graphic violent content" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4731,8 +4364,7 @@ msgstr "Grooming or predatory behaviour" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking or system attacks" ->>>>>>> upstream/main +msgstr "Hacking or system attacks>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Haptics" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Harassment, trolling or intolerance" -======= -msgstr "Harassment or hate" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Harmful or high-risk activities" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Harming or endangering minors" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hate speech" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Have a code? <0>Click here." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Having trouble?" +msgstr "Having trouble?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Hide customisation options" +msgstr "Hide customisation options<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Hide lists" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Hide post for me" @@ -5015,11 +4613,7 @@ msgstr "How should we open this link?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Human trafficking" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "If you're a developer, you can host your own server." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "If you're trying to change your handle or email, do so before you deactivate." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegal and Urgent" +msgstr "If you're trying to change your handle or email, do so before you deactivate.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Image" @@ -5113,29 +4699,15 @@ msgstr "Image saved" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Images cannot be saved unless permission is granted to access your photo library." +msgstr "Images cannot be saved unless permission is granted to access your photo library.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Impersonation or false claims about identity or affiliation" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Impersonation, misinformation or false claims" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Impersonation" ->>>>>>> upstream/main +msgstr "Impersonation>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "In-app, Push, Everyone" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "In-app, Push, People you follow" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Inappropriate messages or explicit links" +msgstr "In-app, Push, People you follow<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Input password for account deletion" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Input the code which has been emailed to you" +msgstr "Input the code which has been emailed to you<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaction limited" @@ -5287,7 +4844,7 @@ msgstr "It's just <0>{0} right now! Add more people to your starter pack by msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "It's just you right now! Add more people to your starter pack by searching above." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Job ID: {0}" @@ -5330,17 +4887,13 @@ msgstr "Labelled by {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Labelled by the author." +msgstr "Labelled by the author.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Labels" @@ -5405,17 +4958,9 @@ msgstr "Learn More" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Learn more about age assurance" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Learn more about Bluesky" +msgstr "Learn more about age assurance<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Learn more about self-hosting your PDS." @@ -5450,15 +4995,10 @@ msgstr "Learn more about what is public on Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Learn more in your <0>account settings." +msgstr "Learn more in your <0>account settings.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Learn more." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Like" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Like ({0, plural, one {# like} other {# likes}})" @@ -5589,13 +5125,9 @@ msgstr "Likes of your reposts" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Likes of your reposts notifications" +msgstr "Likes of your reposts notifications<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Likes on this post" @@ -5899,49 +5431,24 @@ msgstr "Message options" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages" +msgstr "Messages<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Midnight" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Minor harassment or bullying" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Miscellaneous notifications" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Misleading Account" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Misleading Post" -======= -msgstr "Misleading" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Moderation tools" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderator has chosen to set a general warning on the content." +msgstr "Moderator has chosen to set a general warning on the content.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "More feeds" @@ -6150,18 +5652,8 @@ msgstr "My Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Name" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Name or Description Violates Community Standards" - -======= ->>>>>>> upstream/main +msgstr "Name<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "No image" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "No likes yet" +msgstr "No likes yet<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "No longer following {0}" @@ -6386,7 +5873,7 @@ msgstr "No messages yet" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "No notifications yet!" @@ -6440,9 +5927,9 @@ msgstr "No results found" msgid "No results found for \"{query}\"" msgstr "No results found for \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "No results found for {query}" @@ -6482,11 +5969,7 @@ msgstr "Nobody was found. Try searching for someone else." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Non-consensual intimate imagery" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Now" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudity" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudity or adult content not labelled as such" +msgstr "Nudity<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okay" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Open drawer menu" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Open emoji picker" @@ -6815,7 +6287,7 @@ msgstr "Opens composer" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Opens emoji picker" @@ -6855,15 +6327,10 @@ msgstr "Opens password reset form" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Opens post language settings" +msgstr "Opens post language settings<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Opens this profile" @@ -6897,12 +6364,7 @@ msgstr "OTA status: None available" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Other" @@ -6912,35 +6374,8 @@ msgstr "Other account" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Other child safety issue" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Other dangerous content" @@ -6963,8 +6398,7 @@ msgstr "Other sexual violence content" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Other violent content" ->>>>>>> upstream/main +msgstr "Other violent content>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "People following @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "People I follow" +msgstr "People I follow<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "People you follow" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "People you mention" +msgstr "People you mention>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Permission to access your photo library was denied. Please enable it in your system settings." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Post All" @@ -7341,19 +6768,12 @@ msgstr "Post deleted" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Post failed to upload. Please check your Internet connection and try again." +msgstr "Post failed to upload. Please check your Internet connection and try again.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Post has been deleted" @@ -7487,13 +6907,9 @@ msgstr "Privacy Policy" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Privacy violation of a minor" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Processing video..." @@ -7521,15 +6937,11 @@ msgstr "Profile updated" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promoting or selling prohibited items or services" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main +msgstr "Psst! You can edit who can interact with this post.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Public, shareable lists which can be used to drive feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publish post" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publish posts" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publish replies" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publish reply" @@ -7622,13 +7034,9 @@ msgstr "Quote posts disabled" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Quotes" +msgstr "Quotes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Quotes of this post" @@ -7689,12 +7097,12 @@ msgstr "Read the Bluesky Terms of Service" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Remove attachment" msgid "Remove Avatar" msgstr "Remove Avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Remove Banner" @@ -7960,17 +7368,13 @@ msgstr "Replies disabled" msgid "Replies to this post are disabled." msgstr "Replies to this post are disabled." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Reply" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Reply ({0, plural, one {# reply} other {# replies}})" @@ -8060,11 +7464,7 @@ msgstr "Report submitted" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Report this conversation" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Reposted by you" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts" +msgstr "Reposts<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Reposts of this post" @@ -8214,17 +7610,13 @@ msgstr "Reset onboarding state" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reset password" +msgstr "Reset password<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Retries signing in" @@ -8377,28 +7769,21 @@ msgstr "Say hello!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Scam" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Science" +msgstr "Science<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Scroll left" @@ -8443,11 +7828,11 @@ msgstr "Search for \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Search for \"{interestsDisplayName}\" (active)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Search for \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Search for \"{searchText}\"" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Search GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Search is currently unavailable when logged out" @@ -8565,11 +7950,7 @@ msgstr "Select a colour" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Select a reason" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "Selecting multiple media types is not supported." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Self-harm or dangerous behaviours" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Set birthdate" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Set new password" +msgstr "Set new password<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Set precisely which groups of people can reply to your post" +msgstr "Set precisely which groups of people can reply to your post>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Set up your account" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Show replies" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Show replies as" +msgstr "Show replies as<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Show reply for everyone" @@ -9062,13 +8423,9 @@ msgstr "Show warning" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Show warning and filter from feeds" +msgstr "Show warning and filter from feeds<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Shows information about when this post was created" @@ -9089,7 +8446,7 @@ msgstr "Shows the content" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Source: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; excessive mentions or replies" -======= -msgstr "Spam or other inauthentic behaviour or deception" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Suggested for you" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestive" +msgstr "Suggestive<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Sunrise" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Sunset" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Tap to dismiss" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Targeted harassment" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Terms" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Terms of Service" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Terms used violate community standards" - -======= ->>>>>>> upstream/main +msgstr "Terms of Service<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Text & tags" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "That's everything!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "The account will be able to interact with you after unblocking." @@ -9803,17 +9115,12 @@ msgstr "There was an issue contacting the server" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "There was an issue contacting the server, please check your internet connection and try again." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "There was an issue fetching notifications. Tap here to try again." +msgstr "There was an issue fetching notifications. Tap here to try again.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "There was an issue fetching posts. Tap here to try again." @@ -9852,16 +9159,9 @@ msgstr "There was an issue updating your feeds, please check your internet conne #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "There was an unexpected issue in the application. Please let us know if #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." +msgstr "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "These are your default settings" ->>>>>>> upstream/main +msgstr "These are your default settings>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "This list is empty." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "This moderation service is unavailable. See below for more details. If this issue persists, contact us." +msgstr "This moderation service is unavailable. See below for more details. If this issue persists, contact us.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Threads Preferences" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Threats or incitement" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Topic" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Translate" @@ -10262,11 +9541,7 @@ msgstr "Trending Videos" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Unblock" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Unblock account" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Unblock Account?" @@ -10406,16 +9672,8 @@ msgstr "Undo repost" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Undo repost ({0, plural, one {# repost} other {# reposts}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Unfollow" +msgstr "Undo repost ({0, plural, one {# repost} other {# reposts}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Unfollow {0}" @@ -10443,32 +9701,18 @@ msgstr "Unknown verifier" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Unlabelled adult content" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Unlabelled, abusive, or non-consensual adult content" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Unlike" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Unlike ({0, plural, one {# like} other {# likes}})" @@ -10579,16 +9823,8 @@ msgstr "Unsubscribed from list" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Unsupported video type: {mimeType}" +msgstr "Unsupported video type: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Unwanted Sexual Content" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Upload a text file to:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Upload from Camera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Upload from Files" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Upload from Library" @@ -10664,7 +9900,7 @@ msgstr "Uploading images..." msgid "Uploading link thumbnail..." msgstr "Uploading link thumbnail..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Uploading video..." @@ -10918,7 +10154,7 @@ msgstr "Video not found." msgid "Video settings" msgstr "Video settings" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video uploaded" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "View" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "View {0}'s avatar" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "View blogpost for more details" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "View debug entry" +msgstr "View debug entry<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "View details" @@ -11013,10 +10248,6 @@ msgstr "View post" msgid "View profile" msgstr "View profile" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "View the avatar" @@ -11060,15 +10291,10 @@ msgstr "View your muted accounts" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "View your verifications" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "View your verifications<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Views full image" @@ -11078,24 +10304,16 @@ msgstr "Views video in immersive mode" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Violent or threatening content>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violence" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Violent or threatening content" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "We're sorry, but we were unable to resolve this list. If this persists, msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "We're sorry, but we weren't able to load your muted words at this time. Please try again." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "We're sorry, but your search could not be completed. Please try again in a few minutes." @@ -11346,11 +10564,7 @@ msgstr "Why are you appealing?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Why should this conversation be reviewed?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Why should this user be reviewed?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main +msgstr "Would you like to block this user and/or delete this conversation?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "You're signed in with an App Password. Please sign in with your main pas #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "You've already appealed this label and it's being reviewed by our moderation team." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po index c280f4194..75798a128 100644 --- a/src/locale/locales/en/messages.po +++ b/src/locale/locales/en/messages.po @@ -499,7 +499,7 @@ msgid "<0>{date} at {time}" msgstr "" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -590,15 +590,10 @@ msgstr "" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 @@ -634,17 +629,13 @@ msgstr "" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "" @@ -739,7 +730,7 @@ msgstr "" msgid "Add another post" msgstr "" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -1193,15 +1184,10 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "" @@ -1234,19 +1220,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "" @@ -1362,7 +1341,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1483,18 +1462,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "" @@ -1526,36 +1501,18 @@ msgstr "" #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 ->>>>>>> upstream/main msgid "Bluesky" msgstr "Bitchsky" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "" @@ -1720,19 +1677,13 @@ msgstr "" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1995,19 +1946,8 @@ msgstr "" #: src/components/dialogs/EmailDialog/screens/Verify.tsx:275 msgid "Click here to update your email" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:348 -msgid "Click to disable quote posts of this post." -msgstr "Click to disable quote skeets of this post." - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:349 -msgid "Click to enable quote posts of this post." -msgstr "Click to enable quote skeets of this post." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/RichTextTag.tsx:54 msgid "Click to open tag menu for {tag}" msgstr "" @@ -2051,19 +1991,11 @@ msgstr "" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2133,7 +2065,7 @@ msgstr "" msgid "Closes password update alert" msgstr "" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2205,7 +2137,7 @@ msgstr "Compose skeets up to {0, plural, other {# characters}} in length" msgid "Compose reply" msgstr "" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "" @@ -2435,17 +2367,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "" @@ -2607,7 +2533,7 @@ msgstr "" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "" @@ -2668,15 +2594,8 @@ msgstr "" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Customize who can interact with this skeet." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2729,17 +2648,13 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "" @@ -2914,20 +2829,26 @@ msgstr "" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -2941,17 +2862,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3011,7 +2921,7 @@ msgstr "" msgid "Dismiss" msgstr "" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "" @@ -3233,7 +3143,7 @@ msgid "Edit" msgstr "" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "" @@ -3508,7 +3418,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "" @@ -3529,11 +3439,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -4228,15 +4138,8 @@ msgstr "" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Frequently Skeets Unwanted Content" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4578,23 +4481,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Hide skeet for me" @@ -4778,17 +4672,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "" @@ -4873,21 +4759,13 @@ msgstr "" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "" @@ -4961,7 +4839,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "" @@ -5004,17 +4882,13 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "" @@ -5079,17 +4953,9 @@ msgstr "" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "" @@ -5576,21 +5442,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Misleading Skeet" +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 -======= -#: src/Navigation.tsx:177 ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 #: src/screens/Settings/Settings.tsx:192 @@ -6014,7 +5868,7 @@ msgstr "" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "" @@ -6068,9 +5922,9 @@ msgstr "" msgid "No results found for \"{query}\"" msgstr "" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "" @@ -6328,7 +6182,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "" @@ -6428,7 +6282,7 @@ msgstr "" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6468,15 +6322,10 @@ msgstr "" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Opens skeet language settings" +msgstr "Opens skeet language settings<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "" @@ -6886,12 +6735,12 @@ msgctxt "description" msgid "Post" msgstr "Skeet" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Skeet" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Skeet All" @@ -7055,7 +6904,7 @@ msgstr "" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "" @@ -7102,22 +6951,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publish skeet" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publish skeets" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7243,12 +7092,12 @@ msgstr "" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7339,8 +7188,8 @@ msgstr "" msgid "Remove Avatar" msgstr "" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "" @@ -7514,7 +7363,7 @@ msgstr "" msgid "Replies to this post are disabled." msgstr "Replies to this skeet are disabled." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "" @@ -7756,17 +7605,13 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -7978,11 +7823,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "" @@ -8007,7 +7852,7 @@ msgid "Search GIFs" msgstr "" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8596,7 +8441,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9265,17 +9110,12 @@ msgstr "" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "There was an issue fetching skeets. Tap here to try again." @@ -9344,19 +9184,14 @@ msgstr "" #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." +msgstr "<<<<<<< HEAD<<<<<<< HEAD" + +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 +msgid "These are your default settings" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main -msgid "These are your default settings" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10034,20 +9869,20 @@ msgstr "" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "" @@ -10060,7 +9895,7 @@ msgstr "" msgid "Uploading link thumbnail..." msgstr "" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "" @@ -10314,7 +10149,7 @@ msgstr "" msgid "Video settings" msgstr "" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "" @@ -10339,10 +10174,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10404,10 +10243,6 @@ msgstr "View skeet" msgid "View profile" msgstr "" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "" @@ -10451,15 +10286,10 @@ msgstr "" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10628,7 +10458,7 @@ msgstr "" msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "" diff --git a/src/locale/locales/eo/messages.po b/src/locale/locales/eo/messages.po index 421a3c31b..c97f115f0 100644 --- a/src/locale/locales/eo/messages.po +++ b/src/locale/locales/eo/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {sekvanto} other {sekvantoj}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {sekvata} other {sekvataj}}" +msgstr "{0, plural, one {sekvata} other {sekvataj}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {ŝato} other {ŝatoj}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {afiŝo} other {afiŝoj}}" +msgstr "{0, plural, one {afiŝo} other {afiŝoj}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citaĵo} other {citaĵoj}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {reafiŝo} other {reafiŝoj}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citaĵo} other {citaĵoj}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {reafiŝo} other {reafiŝoj}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {konservo} other {konservoj}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# pli}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Konto)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} je {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Ensalutu<1> aŭ <2>kreu konton<3> <4>por serĉi pri novaĵoj, sportoj, politiko kaj ĉio alia okazanta ĉe Bluesky." @@ -615,30 +595,19 @@ msgstr "Alirebleco" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Alireblecaj agordoj" +msgstr "Alireblecaj agordoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto" +msgstr "Konto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Konto blokita" @@ -665,26 +634,18 @@ msgstr "Konto silentigita de listo" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontaj opcioj" +msgstr "Kontaj opcioj<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Konto forigita el la rapidatingo" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Konto malblokita" @@ -774,7 +735,7 @@ msgstr "Aldoni plian konton" msgid "Add another post" msgstr "Aldoni plian afiŝon" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Aldoni plian afiŝon al fadeno" @@ -890,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Poradolta enhavo" @@ -1120,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Ilustraĵo montranta ke Bluesky elektas fidatajn konfirmantojn kaj poste fidataj konfirmantoj konfirmas individuajn kontojn de uzantoj." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Problemo neinkludita inter ĉi tiuj opcioj" @@ -1181,21 +1134,11 @@ msgstr "Anonco" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anoncas konfirmadon ĉe Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Kontraŭsocia konduto" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Anoncas konfirmadon ĉe Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1246,15 +1189,10 @@ msgstr "Nomoj de apaj pasvortoj devas havi longon de almenaŭ 4 signoj" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Apaj pasvortoj" +msgstr "Apaj pasvortoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Apaj pasvortoj" @@ -1287,19 +1225,12 @@ msgstr "Apelacii pri suspendo" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelacii pri ĉi tiu decido" +msgstr "Apelacii pri ĉi tiu decido<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aspekto" @@ -1311,23 +1242,14 @@ msgstr "Apliki defaŭltajn rekomenditajn fluojn" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Apliki tirpeton" +msgstr "Apliki tirpeton<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arkivigita de {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arkivigita de {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arkivigita afiŝo" @@ -1396,18 +1318,11 @@ msgstr "Asigni temon por algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Almenaŭ 8 signoj" +msgstr "Almenaŭ 8 signoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Nordobrilo" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1421,13 +1336,8 @@ msgstr "Disponebla" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1436,7 +1346,7 @@ msgstr "Disponebla" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1501,9 +1411,8 @@ msgstr "Komencu procezon de garantio pri aĝo kompletigante la kampojn sube." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Naskiĝtago" +msgstr "Naskiĝtago<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1511,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloki" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloki konton" @@ -1551,15 +1446,8 @@ msgstr "Bloki kontojn" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloki kaj forigi" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloki kaj/aŭ forigi ĉi tiun konversacion" +msgstr "Bloki kaj forigi<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloki liston" @@ -1579,18 +1467,14 @@ msgstr "Bloki uzanton" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloki uzanton" +msgstr "Bloki uzanton<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blokita" @@ -1622,40 +1506,18 @@ msgstr "Blokado estas publika. Baritaj kontoj ne povas respondi en viaj fadenoj, #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Barado ne malebligos al oni meti etikedojn sur vian konton, sed malebligos al ĉi tiu konto respondi en viaj fadenoj aŭ interagi kun vi." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky ne povas konfirmi la aŭtentecon de la donita dato." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blogo" +msgstr "Barado ne malebligos al oni meti etikedojn sur vian konton, sed malebligos al ĉi tiu konto respondi en viaj fadenoj aŭ interagi kun vi.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky ne povas konfirmi la aŭtentecon de la donita dato." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky estas malfermita reto, kie elekteblas provizanto de gastigo. Se vi estas programisto, vi povas gastigi vian propran servilon." @@ -1707,13 +1569,9 @@ msgstr "Libroj" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Foliumi pli da kontoj sur la paĝo Esplori" @@ -1824,19 +1682,13 @@ msgstr "Fotilo" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1864,17 +1716,11 @@ msgstr "Nuligi reaktivigon kaj elsaluti" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Nuligi serĉon" +msgstr "Nuligi serĉon<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Ne eblas interagi kun blokita uzanto" @@ -1987,11 +1833,7 @@ msgid "Chat requests" msgstr "Babilpetoj" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2154,19 +1996,11 @@ msgstr "🐮 Dek bovinoj 🐮" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2236,7 +2070,7 @@ msgstr "Fermi bonvenon-fenestron" msgid "Closes password update alert" msgstr "Fermas la averton pri pasvorta ĝisdatigo" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Fermas afiŝan redaktilon kaj forĵetas afiŝan malneton" @@ -2308,7 +2142,7 @@ msgstr "Krei afiŝojn maksimume {0, plural, one {# signon}other {# signojn}} lon msgid "Compose reply" msgstr "Krei respondon" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Densigado de videaĵo..." @@ -2538,17 +2372,11 @@ msgstr "Kopii la DID-on de la aŭtoro" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopii kodon" +msgstr "Kopii kodon<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopii DID-on" @@ -2710,7 +2538,7 @@ msgstr "Krei konton" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Krei konton" @@ -2771,15 +2599,8 @@ msgstr "Propra" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Adaptadaj opcioj" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Agordu, kiu povas interagi kun ĉi tiu afiŝo." +msgstr "Adaptadaj opcioj<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Adaptas vian ĝuon ĉe Bluesky" @@ -2790,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Malhela" @@ -2839,17 +2653,13 @@ msgstr "Panelo de sencimigo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Defaŭlta" @@ -2858,17 +2668,10 @@ msgid "Default icons" msgstr "Defaŭltaj piktogramoj" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3031,20 +2834,26 @@ msgstr "Malŝalti retpoŝtan 2FA-on" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Malŝalti tuŝ-retrokupladan prikomentadon" +msgstr "Malŝalti tuŝ-retrokupladan prikomentadon<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3058,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3128,7 +2926,7 @@ msgstr "Malkovri novajn fluojn" msgid "Dismiss" msgstr "Ignori" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Ignori eraron" @@ -3216,11 +3014,8 @@ msgstr "Ne maltrankvilu! Ĉiuj ekzistantaj mesaĝoj kaj agordoj estas konservita #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3268,9 +3063,8 @@ msgstr "Elŝuti Bluesky-apon" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Elŝuti CAR-dosieron" +msgstr "Elŝuti CAR-dosieron<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3289,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3356,7 +3148,7 @@ msgid "Edit" msgstr "Redakti" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Redakti profilbildon" @@ -3631,7 +3423,7 @@ msgstr "Ŝaltas plenekranon" msgid "Entertainment" msgstr "Amuzo" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Eraro" @@ -3652,11 +3444,11 @@ msgstr "Erara mesaĝo" msgid "Error occurred while saving file" msgstr "Eraro okazis dum konservado de dosiero" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Eraris ricevante la captcha-respondon." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Eraro: {error}" @@ -3678,19 +3470,8 @@ msgstr "Ĉiuj" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Ĉio alia" +msgstr "Ĉio alia<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Troaj mencioj aŭ respondoj" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Troaj aŭ nedezirataj mesaĝoj" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Ekskluzivi uzantojn, kiujn vi sekvas" @@ -4022,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Fluo" @@ -4169,26 +3946,8 @@ msgstr "Fini" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fizika bontenado" +msgstr "Fizika bontenado<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Plata nigra" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Plata blua" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Plata blanka" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Fleksebla" @@ -4199,16 +3958,7 @@ msgstr "Fleksebla" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Sekvi" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Sekvi" @@ -4251,16 +4001,8 @@ msgstr "Eksekvu ĉiujn kontojn" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Sekvi reciproke" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Sekvi reciproke" @@ -4300,13 +4042,9 @@ msgstr "Sekvantoj, kiujn vi konas" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Sekvas" @@ -4314,16 +4052,11 @@ msgstr "Sekvas" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Sekvas" +msgstr "Sekvas<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Sekvas {0}" @@ -4410,15 +4143,8 @@ msgstr "Ĉu vi forgesis?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Liberu vian fluon" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Ofte afiŝas nedeziratan enhavon" +msgstr "Liberu vian fluon<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De" @@ -4519,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Donu vizaĝon al via profilo" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Evidentaj malobservoj de la leĝo aŭ uzokondiĉoj" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Donu vizaĝon al via profilo<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4679,21 +4395,7 @@ msgstr "Tuŝ-retrokuplado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Molestado, trolado aŭ netoleremo" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4722,15 +4424,10 @@ msgstr "Ĉu vi havas kodon? <0>Alklaku ĉi tie." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ĉu vi havas problemon?" +msgstr "Ĉu vi havas problemon?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4789,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Kaŝi adaptadajn opciojn" +msgstr "Kaŝi adaptadajn opciojn<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Kaŝi afiŝon por mi" @@ -4989,17 +4677,9 @@ msgstr "Se vi estas programisto, vi povas gastigi vian propran servilon." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Se vi provas ŝanĝi vian identigilon aŭ retpoŝtadreson, faru tion antaŭ ol malaktivigi vian konton." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Kontraŭleĝa kaj urĝa" +msgstr "Se vi provas ŝanĝi vian identigilon aŭ retpoŝtadreson, faru tion antaŭ ol malaktivigi vian konton.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Bildo" @@ -5019,29 +4699,15 @@ msgstr "Bildo konservita" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Bildoj ne povas esti konservitaj sen permeso por aliro al via bildbiblioteko." +msgstr "Bildoj ne povas esti konservitaj sen permeso por aliro al via bildbiblioteko.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Identoprunto aŭ malveraj asertoj pri identeco aŭ aneco" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Identoprunto, misinformado aŭ malveraj asertoj" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5069,15 +4735,7 @@ msgstr "En-apaj, Ŝprucaj, Ĉiuj" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -<<<<<<< HEAD -msgstr "En-apaj, Puŝaj, Homoj kiujn vi sekvas" - -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Malkonvenaj mesaĝoj aŭ maldecaj ligiloj" -======= -msgstr "En-apaj, Ŝprucaj, Homoj kiujn vi sekvas" ->>>>>>> upstream/main +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -5106,21 +4764,13 @@ msgstr "Entajpu pasvorton por forigi vian konton" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Entajpu la kodon senditan al via retpoŝtadreso" +msgstr "Entajpu la kodon senditan al via retpoŝtadreso<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interago limigita" @@ -5194,7 +4844,7 @@ msgstr "<0>{0} estas sola ĉi-momente! Aldoni pli da homoj al via startpako msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Vi estas sola ĉi-momente! Aldoni pli da homoj al via startpako serĉante supre." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID de laboro: {0}" @@ -5237,17 +4887,13 @@ msgstr "Etikedita de {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etikedita de la aŭtoro." +msgstr "Etikedita de la aŭtoro.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etikedoj" @@ -5312,17 +4958,9 @@ msgstr "Eksciu pli" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Eksciu pli pri garantio pri aĝo" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Eksciu pli pri Bluesky" +msgstr "Eksciu pli pri garantio pri aĝo<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Eksciu pli pri gastigado de via PDS." @@ -5357,15 +4995,10 @@ msgstr "Eksciu pli pri kio estas publika ĉe Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Eksciu pli en viaj <0>kontaj agordoj." +msgstr "Eksciu pli en viaj <0>kontaj agordoj.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Eksciu pli." @@ -5429,11 +5062,7 @@ msgid "Like" msgstr "Ŝati" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Ŝati ({0, plural, one {# ŝato} other {# ŝatoj}})" @@ -5496,13 +5125,9 @@ msgstr "Ŝatoj de viaj reafiŝoj" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Sciigoj pri ŝatoj de viaj reafiŝoj" +msgstr "Sciigoj pri ŝatoj de viaj reafiŝoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Ŝatoj de ĉi tiu afiŝo" @@ -5806,45 +5431,23 @@ msgstr "Opcioj de mesaĝo" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesaĝoj" +msgstr "Mesaĝoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Noktomezo" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Sciigoj aliaj" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Trompa konto" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Trompa afiŝo" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5905,15 +5508,10 @@ msgstr "Kontroladaj iloj" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Kontrolanto decidis starigi ĝeneralan averton pri la enhavo." +msgstr "Kontrolanto decidis starigi ĝeneralan averton pri la enhavo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Pli da fluoj" @@ -6054,18 +5652,8 @@ msgstr "Miaj fluoj" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nomo" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nomo aŭ priskribo kontraŭas komunumajn normojn" - -======= ->>>>>>> upstream/main +msgstr "Nomo<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6269,16 +5857,11 @@ msgstr "Sen bildo" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ankoraŭ ne estas ŝatoj" +msgstr "Ankoraŭ ne estas ŝatoj<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Vi ne plu sekvas {0}" @@ -6290,7 +5873,7 @@ msgstr "Ankoraŭ ne estas mesaĝoj" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Ne plu da eterna rulumado tra aĉaĵo-plenaj algoritmoj. Trovu fluojn kiuj funkcias por vi, ne kontraŭ vi." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ankoraŭ ne estas sciigoj!" @@ -6344,9 +5927,9 @@ msgstr "Neniu rezulto trovita" msgid "No results found for \"{query}\"" msgstr "Neniu rezulto trovita por \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Neniu rezulto trovita por {query}" @@ -6481,15 +6064,8 @@ msgstr "Nun" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudeco" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudeco aŭ poradolta enhavo ne etikedita tiel" +msgstr "Nudeco<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6510,11 +6086,7 @@ msgid "OK" msgstr "Bone" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Bone" @@ -6615,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Malfermi flankmenuon" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Malfermi emoĝi-elektilon" @@ -6715,7 +6287,7 @@ msgstr "Malfermas afiŝ-kreilon" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Malfermas aparatan galerion por elekti ĝis {MAX_IMAGES, plural, other {# bildojn}}, aŭ unuopan videaĵon aŭ GIF-on." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Malfermas emoĝi-elektilon" @@ -6755,15 +6327,10 @@ msgstr "Malfermas formularon por restarigi la pasvorton" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Malfermi agordojn de afiŝaj lingvoj" +msgstr "Malfermi agordojn de afiŝaj lingvoj<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Malfermas ĉi tiun profilon" @@ -6797,12 +6364,7 @@ msgstr "OTA stato: Neniu disponebla" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Alia" @@ -6912,23 +6474,16 @@ msgstr "Homoj sekvantaj @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Homoj kiujn mi sekvas" +msgstr "Homoj kiujn mi sekvas<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Permeso por aliro al via bildbiblioteko estis neita. Bonvolu doni ĝin en viaj sistemagordoj." @@ -7185,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Afiŝo" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Afiŝi" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Afiŝi ĉiujn" @@ -7213,19 +6768,12 @@ msgstr "Afiŝo forigita" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Malsukcesis ŝargi afiŝon. Bonvolu kontroli vian retkonekton kaj reprovi." +msgstr "Malsukcesis ŝargi afiŝon. Bonvolu kontroli vian retkonekton kaj reprovi.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Afiŝo estis forigita" @@ -7361,7 +6909,7 @@ msgstr "Regularo pri privateco" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Pritraktado de videaĵo..." @@ -7389,19 +6937,12 @@ msgstr "Profilo ĝisdatigita" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Publika" @@ -7415,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Publikaj k kundivideblaj listoj, kiuj povas esti uzitaj por funkciigi fluojn." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publikigi afiŝon" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publikigi afiŝojn" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publikigi respondojn" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publikigi respondon" @@ -7493,13 +7034,9 @@ msgstr "Citafiŝoj malebligitaj" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citaĵoj" +msgstr "Citaĵoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citaĵoj de ĉi tiu afiŝo" @@ -7560,12 +7097,12 @@ msgstr "Legi la uzokondiĉojn de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7656,8 +7193,8 @@ msgstr "Forigi aldonaĵon" msgid "Remove Avatar" msgstr "Forigi profilbildon" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Forigi rubandon" @@ -7831,17 +7368,13 @@ msgstr "Respondoj malebligitaj" msgid "Replies to this post are disabled." msgstr "Respondoj por ĉi tiu afiŝo estis malebligitaj." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Respondi" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Respondi ({0, plural, one {# respondo} other {# respondoj}})" @@ -8002,13 +7535,9 @@ msgstr "Reafiŝita de vi" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reafiŝoj" +msgstr "Reafiŝoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Reafiŝoj de ĉi tiu afiŝo" @@ -8081,17 +7610,13 @@ msgstr "Restarigi staton de la lernilo" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restarigi pasvorton" +msgstr "Restarigi pasvorton<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Provoj ensaluti" @@ -8249,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scienco" +msgstr "Scienco<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Rulumi maldekstren" @@ -8306,11 +7828,11 @@ msgstr "Serĉi \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Serĉi \"{interestsDisplayName}\" (aktiva)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Serĉi \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Serĉi \"{searchText}\"" @@ -8335,7 +7857,7 @@ msgid "Search GIFs" msgstr "Serĉi GIF-ojn" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Serĉado nun estas nedisponebla kiam elsalutinta" @@ -8635,19 +8157,12 @@ msgstr "Agordi naskiĝdaton" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Agordi novan pasvorton" +msgstr "Agordi novan pasvorton<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Agordu vian konton" @@ -8799,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8889,15 +8400,10 @@ msgstr "Montri respondojn" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Montri respondojn" +msgstr "Montri respondojn<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Montri respondojn por ĉiuj" @@ -8917,13 +8423,9 @@ msgstr "Montri averton" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Montri averton kaj elfiltri el fluoj" +msgstr "Montri averton kaj elfiltri el fluoj<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Montri informojn pri kiam ĉi tiu afiŝo estis kreita" @@ -8944,7 +8446,7 @@ msgstr "Montras la enhavon" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9151,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Fonto: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Trudaĵo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Trudaĵo; troaj mencioj aŭ respondoj" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9323,23 +8813,9 @@ msgstr "Proponitaj por vi" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Maldeca" +msgstr "Maldeca<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Sunleviĝo" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Sunsubiro" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9457,18 +8933,8 @@ msgstr "Kondiĉoj" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Uzokondiĉoj" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Uzitaj terminoj kontraŭas komunumajn normojn" - -======= ->>>>>>> upstream/main +msgstr "Uzokondiĉoj<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Teksto k kradvortoj" @@ -9517,11 +8983,7 @@ msgid "That's everything!" msgstr "Tio estas ĉio!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Post malbloki, la konto povos interagi kun vi." @@ -9653,17 +9115,12 @@ msgstr "Estis problemo konektante servilon" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Estis problemo konektante servilon, bonvolu kontroli vian interretan konekton kaj reprovu." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Estis problemo ŝargante sciigojn. Tuŝetu ĉi tie por reprovi." +msgstr "Estis problemo ŝargante sciigojn. Tuŝetu ĉi tie por reprovi.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Estis problemo ŝargante afiŝojn. Tuŝeti ĉi tie por reprovi." @@ -9702,16 +9159,9 @@ msgstr "Estis problemo ĝisdatigante viajn fluojn, bonvolu kontroli vian interre #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9739,19 +9189,14 @@ msgstr "Okazis neatendita problemo en la aplikaĵo. Bonvolu sciigi nin se tio ok #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Estas impeto de novaj uzantoj ĉe Bluesky! Ni aktivigos vian konton kiel eble plej rapide." +msgstr "Estas impeto de novaj uzantoj ĉe Bluesky! Ni aktivigos vian konton kiel eble plej rapide.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9904,13 +9349,9 @@ msgstr "Ĉi tiu listo malplenas." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Ĉi tiu kontrolservo neatingeblas. Vidu pli da detaloj sube. Se ĉi tiu problemo daŭras, kontaktu nin." +msgstr "Ĉi tiu kontrolservo neatingeblas. Vidu pli da detaloj sube. Se ĉi tiu problemo daŭras, kontaktu nin.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Ĉi tiu afiŝo asertas, ke ĝi estis kreita je <0>{0}, sed ĝi estis unue vidita ĉe Bluesky je <1>{1}." @@ -10078,17 +9519,10 @@ msgstr "Temo" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traduki" @@ -10210,22 +9644,13 @@ msgstr "Malbloki" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Malbloki konton" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Ĉu malbloki konton?" @@ -10247,16 +9672,8 @@ msgstr "Malfari reafiŝon" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Malfari reafiŝon ({0, plural, one {# reafiŝo} other {# reafiŝoj}})" +msgstr "Malfari reafiŝon ({0, plural, one {# reafiŝo} other {# reafiŝoj}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Ne sekvi" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Ne sekvi {0}" @@ -10288,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Ne plu ŝati" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Ne plu ŝati ({0, plural, one {# ŝato} other {# ŝatoj}})" @@ -10414,16 +9823,8 @@ msgstr "Malabonita de listo" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Nesubtenata videaĵa tipo: {mimeType}" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Nedezirata seksuma enhavo" +msgstr "Nesubtenata videaĵa tipo: {mimeType}<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10473,20 +9874,20 @@ msgstr "Alŝuti tekstodosieron al:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Alŝuti el la fotilo" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Alŝuti el la dosieroj" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Alŝuti el la biblioteko" @@ -10499,7 +9900,7 @@ msgstr "Alŝutado de bildoj..." msgid "Uploading link thumbnail..." msgstr "Alŝutado de ligila miniaturo..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Alŝutado de videaĵo..." @@ -10753,7 +10154,7 @@ msgstr "Videaĵo netrovita." msgid "Video settings" msgstr "Agordoj pri videaĵoj" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Videaĵo alŝutita" @@ -10778,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Vidi" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Vidi la profilbildon de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10804,15 +10209,10 @@ msgstr "Vidi blogafiŝon por pli da detaloj" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vidi protokolan eron" +msgstr "Vidi protokolan eron<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Vidi detalojn" @@ -10848,10 +10248,6 @@ msgstr "Vidi afiŝon" msgid "View profile" msgstr "Vidi profilon" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Vidi la profilbildon" @@ -10895,15 +10291,10 @@ msgstr "Vidi viajn silentigitajn kontojn" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vidi viajn konfirmojn" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Vidi viajn konfirmojn<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Montras la tutan bildon" @@ -10917,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11075,7 +10463,7 @@ msgstr "Ni bedaŭras, sed ni ne povis adrestrovi ĉi tiun liston. Se tio daŭras msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Ni bedaŭras, sed ni ne povis ŝargi viajn silentigitajn vortojn nuntempe. Bonvolu provi denove." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Bedaŭrinde, via serĉo malsukcesis. Bonvolu reprovi post kelkaj minutoj." @@ -11203,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Kial ĉi tiu uzanto estu reviziita?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 @@ -11642,11 +11026,7 @@ msgstr "Vi estas ensalutinta per apa pasvorto. Bonvolu ensaluti per via ĉefa pa #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Vi jam apelaciis pri ĉi tiu etikedo kaj ĝi estas revizata de nia kontrolad-teamo." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/es/messages.po b/src/locale/locales/es/messages.po index a890b67d2..a2c3669c2 100644 --- a/src/locale/locales/es/messages.po +++ b/src/locale/locales/es/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {siguiendo} other {siguiendo}}" +msgstr "{0, plural, one {siguiendo} other {siguiendo}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {me gusta} other {me gusta}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publicación} other {publicaciones}}" +msgstr "{0, plural, one {publicación} other {publicaciones}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {cita} other {citas}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republicación} other {republicaciones}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {cita} other {citas}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republicación} other {republicaciones}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} a las {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Inicia sesión<1> o <2>crea una cuenta<3> <4>para acceder a noticias, deportes, debates políticos y todo lo que sucede en Bluesky." @@ -611,30 +595,19 @@ msgstr "Accesibilidad" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ajustes de accesibilidad" +msgstr "Ajustes de accesibilidad<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta" +msgstr "Cuenta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Cuenta bloqueada" @@ -661,26 +634,18 @@ msgstr "Cuenta silenciada por una lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opciones de la cuenta" +msgstr "Opciones de la cuenta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Cuenta eliminada del acceso rápido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Cuenta desbloqueada" @@ -770,7 +735,7 @@ msgstr "Añadir otra cuenta" msgid "Add another post" msgstr "Añadir otra publicación" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contenido para adultos" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Una ilustración que muestra que Bluesky selecciona a verificadores de confianza, los cuales verifican las cuentas de usuarios individuales." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema no presente en estas opciones" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "La verificación llega a Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamiento antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "La verificación llega a Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "El nombre de la contraseña de app debe tener al menos cuatro caracteres #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Contraseñas de app" +msgstr "Contraseñas de app<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Contraseñas de app" @@ -1283,19 +1225,12 @@ msgstr "Apelar la suspensión" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelar esta decisión" +msgstr "Apelar esta decisión<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aparencia" @@ -1307,23 +1242,14 @@ msgstr "Aplicar feeds recomendados predeterminados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archivado desde {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archivado desde {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publicación archivada" @@ -1392,18 +1318,11 @@ msgstr "Asignar un tema para el algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Cumpleaños" +msgstr "Cumpleaños<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquear cuenta" @@ -1547,15 +1446,8 @@ msgstr "Bloquear cuentas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear y eliminar" +msgstr "Bloquear y eliminar<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloquear o eliminar esta conversación" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloquear lista" @@ -1575,18 +1467,14 @@ msgstr "Bloquear usuario" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear usuario" +msgstr "Bloquear usuario<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloqueado" @@ -1618,40 +1506,18 @@ msgstr "El bloqueo es público. Las cuentas bloqueadas no podrán responder en t #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Si bloqueas a un etiquetador aún podrán seguir aplicando etiquetas a tu cuenta, pero evitará que respondan en tus hilos, te mencionen o interactúen contigo." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky no puede confirmar la autenticidad de la fecha declarada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Si bloqueas a un etiquetador aún podrán seguir aplicando etiquetas a tu cuenta, pero evitará que respondan en tus hilos, te mencionen o interactúen contigo.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky no puede confirmar la autenticidad de la fecha declarada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Clásico™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky es una red abierta donde puedes elegir tu proveedor de alojamiento. Si eres un desarrollador, puedes alojar tu propio servidor." @@ -1703,13 +1569,9 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Explorar más cuentas en la página Explorar" @@ -1820,19 +1682,13 @@ msgstr "Cámara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Cancelar la reactivación y cerrar la sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar búsqueda" +msgstr "Cancelar búsqueda<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "No se puede interactuar con un usuario bloqueado" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Solicitudes de chat" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Tacatá 🐴 tacatá 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Cierra la alerta de actualización de contraseña" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Cierra la ventana de redacción y descarta el borrador" @@ -2304,7 +2142,7 @@ msgstr "Escribir publicaciones de hasta {0, plural, other {# caracteres}}" msgid "Compose reply" msgstr "Escribir la respuesta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimiendo video..." @@ -2534,17 +2372,11 @@ msgstr "Copiar el DID del autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código" +msgstr "Copiar código<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar DID" @@ -2706,7 +2538,7 @@ msgstr "Crear una cuenta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crea una cuenta" @@ -2767,15 +2599,8 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opciones de personalización" +msgstr "Opciones de personalización<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personaliza quién puede interactuar con esta publicación." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personaliza tu experiencia en Bluesky" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Oscuro" @@ -2835,17 +2653,13 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Por Defecto" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Iconos por defecto" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Desactivar la autenticación de doble factor por correo electrónico" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactivar la retroalimentación háptica" +msgstr "Desactivar la retroalimentación háptica<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Descubrir nuevos feeds" msgid "Dismiss" msgstr "Descartar" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Descartar error" @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Descargar Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Descargar archivo CAR" +msgstr "Descargar archivo CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar avatar" @@ -3627,7 +3423,7 @@ msgstr "Entra en pantalla completa" msgid "Entertainment" msgstr "Ocio" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3648,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Se produjo un error al guardar el archivo" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error al recibir la respuesta del captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Error: {error}" @@ -3674,19 +3470,8 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menciones o respuestas excesivas" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensajes excesivos o no deseados" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluir a los usuarios que sigues" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4165,26 +3946,8 @@ msgstr "Finalizar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Negro plano" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Azul plano" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Blanco" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4195,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seguir" @@ -4247,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seguir también" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seguir también" @@ -4296,13 +4042,9 @@ msgstr "Seguidores que conoces" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Siguiendo" @@ -4310,16 +4052,11 @@ msgstr "Siguiendo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Siguiendo" +msgstr "Siguiendo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Siguiendo {0}" @@ -4406,15 +4143,8 @@ msgstr "¿La olvidaste?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Frecuentemente Publica Contenido Indeseable" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Ponle cara a tu perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violaciones flagrantes de la Ley o de los Términos de servicio" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Ponle cara a tu perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Acoso, troleo o intolerancia" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "¿Tienes un código? <0>Haz clic aquí." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "¿Tienes problemas?" +msgstr "¿Tienes problemas?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar las opciones de personalización" +msgstr "Ocultar las opciones de personalización<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ocultar el post para mí" @@ -4985,17 +4677,9 @@ msgstr "Si eres desarrollador/a, puedes alojar tu propio servidor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si estás intentando cambiar tu nombre de usuario o correo electrónico, hazlo antes de desactivar tu cuenta." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal y Urgente" +msgstr "Si estás intentando cambiar tu nombre de usuario o correo electrónico, hazlo antes de desactivar tu cuenta.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imagen" @@ -5015,29 +4699,15 @@ msgstr "Imagen guardada" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Suplantación de identidad o afirmaciones falsas sobre identidad o afiliación" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Suplantación de identidad, desinformación o afirmaciones falsas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mensajes inapropiados o enlaces explícitos" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Introduce la contraseña para la eliminación de la cuenta" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Introduce el código que se te ha enviado por correo electrónico." +msgstr "Introduce el código que se te ha enviado por correo electrónico.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interacción limitada" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "¡Solo estás tú por ahora! Agrega más personas a tu paquete de inicio buscando arriba." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Tarea ID: {0}" @@ -5232,17 +4887,13 @@ msgstr "Etiquetado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetado por el autor." +msgstr "Etiquetado por el autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquetas" @@ -5307,17 +4958,9 @@ msgstr "Aprender más" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Más información sobre Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Más información sobre cómo autoalojar tu PDS." @@ -5352,15 +4995,10 @@ msgstr "Más información sobre qué es público en Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Aprender más." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Me gusta" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Like ({0, plural, one {# me gusta} other {# me gusta}})" @@ -5491,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "\"Me gusta\" en esta publicación" @@ -5801,45 +5431,23 @@ msgstr "Opciones del mensaje" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensajes" +msgstr "Mensajes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Medianoche" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cuenta engañosa" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publicación engañosa" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Herramientas de moderación" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "El moderador ha decidido establecer una advertencia general sobre el contenido." +msgstr "El moderador ha decidido establecer una advertencia general sobre el contenido.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Más feeds" @@ -6049,18 +5652,8 @@ msgstr "Mis feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nombre" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nombre o descripción que violan los estándares de la comunidad" - -======= ->>>>>>> upstream/main +msgstr "Nombre<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Todavía no tiene \"me gusta\"" +msgstr "Todavía no tiene \"me gusta\"<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ya no sigues a {0}" @@ -6285,7 +5873,7 @@ msgstr "No hay mensajes aún" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "No hay notificaciones" @@ -6339,9 +5927,9 @@ msgstr "No se encontraron resultados" msgid "No results found for \"{query}\"" msgstr "No se han encontrado resultados para \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "No se han encontrado resultados para {query}" @@ -6476,15 +6064,8 @@ msgstr "Ahora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudez" +msgstr "Desnudez<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Desnudez o contenido para adultos no etiquetado como tal" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "Aceptar" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Está bien" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Abrir el menú lateral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Abrir el selector de emojis" @@ -6710,7 +6287,7 @@ msgstr "Abrir la ventana de redacción" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Abre el selector de emojis" @@ -6750,15 +6327,10 @@ msgstr "Abre el formulario de restablecimiento de contraseña" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Abre este perfil" @@ -6792,12 +6364,7 @@ msgstr "Estado de las actualizaciones: Ninguna disponible" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Otro" @@ -6907,23 +6474,16 @@ msgstr "Personas siguiendo a @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Personas a las que sigo" +msgstr "Personas a las que sigo<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar Todo" @@ -7208,19 +6768,12 @@ msgstr "Publicación eliminada" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Error al subir la publicación. Por favor, verifica tu conexión a internet y vuelve a intentarlo." +msgstr "Error al subir la publicación. Por favor, verifica tu conexión a internet y vuelve a intentarlo.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Publicación eliminada" @@ -7356,7 +6909,7 @@ msgstr "Política de privacidad" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Procesando video..." @@ -7384,19 +6937,12 @@ msgstr "Perfil actualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Público" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listas públicas y compartibles que se pueden usar para impulsar feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicar la publicación" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicar las publicaciones" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicar las respuestas" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicar la respuesta" @@ -7488,13 +7034,9 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas" +msgstr "Citas<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citas de esta publicación" @@ -7555,12 +7097,12 @@ msgstr "Leer los Términos y Condiciones de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Eliminar adjunto" msgid "Remove Avatar" msgstr "Eliminar Avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Eliminar Banner" @@ -7826,17 +7368,13 @@ msgstr "Respuestas deshabilitadas" msgid "Replies to this post are disabled." msgstr "Las respuestas en esta publicación estan deshabilitadas." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Responder ({0, plural, one {# respuesta} other {# respuestas}})" @@ -7997,13 +7535,9 @@ msgstr "Republicado por ti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicaciones" +msgstr "Republicaciones<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicaciones de esta publicación" @@ -8076,17 +7610,13 @@ msgstr "Restablecer el estado de incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablecer contraseña" +msgstr "Restablecer contraseña<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Vuelve a intentar el inicio de sesión" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia" +msgstr "Ciencia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Buscar \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Buscar \"{searchText}\"" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Buscar GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8630,19 +8157,12 @@ msgstr "Establecer cumpleaños" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establecer la contraseña nueva" +msgstr "Establecer la contraseña nueva<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configura tu cuenta" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Mostrar respuestas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar las respuestas como" +msgstr "Mostrar las respuestas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostrar respuesta para todos" @@ -8912,13 +8423,9 @@ msgstr "Mostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar advertencia y filtrar de los feeds" +msgstr "Mostrar advertencia y filtrar de los feeds<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Muestra información sobre la fecha de creación de esta publicación" @@ -8939,7 +8446,7 @@ msgstr "Muestra el contenido" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Origen: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; menciones o respuestas excesivas" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Sugerido para ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo" +msgstr "Sugestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Amanecer" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Atardecer" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Condiciones" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Términos de servicio" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Los términos utilizados violan las normas de la comunidad" - -======= ->>>>>>> upstream/main +msgstr "Términos de servicio<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto y etiquetas" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "¡Se acabó!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "La cuenta podrá interactuar contigo tras desbloquearla." @@ -9648,17 +9115,12 @@ msgstr "Hubo un problema al contactar con el servidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Hubo un problema al contactar con el servidor. Por favor, verifica tu conexión a internet e inténtalo de nuevo." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Hubo un problema al obtener las notificaciones. Toca aquí para intentar de nuevo." +msgstr "Hubo un problema al obtener las notificaciones. Toca aquí para intentar de nuevo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Hubo un problema al obtener las publicaciones. Toca aquí para intentar de nuevo." @@ -9697,16 +9159,9 @@ msgstr "Hubo un problema al actualizar tus feeds, por favor verifica tu conexió #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Se ha producido un problema inesperado en la aplicación. Por favor, ¡a #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "¡Ha habido una oleada de nuevos usuarios en Bluesky! Activaremos tu cuenta tan pronto como podamos." +msgstr "¡Ha habido una oleada de nuevos usuarios en Bluesky! Activaremos tu cuenta tan pronto como podamos.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Esta lista está vacía" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Este servicio de moderación no está disponible. Consulta más detalles a continuación. Si el problema persiste, contáctanos." +msgstr "Este servicio de moderación no está disponible. Consulta más detalles a continuación. Si el problema persiste, contáctanos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Esta publicación declara haber sido creada en <0>{0}, pero fue vista por primera vez por Bluesky en <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Tema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducir" @@ -10205,22 +9644,13 @@ msgstr "Desbloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloquear la cuenta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "¿Desbloquear la cuenta?" @@ -10242,16 +9672,8 @@ msgstr "Deshacer la republicación" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Deshacer la republicación ({0, plural, one {# republicación} other {# republicaciones}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Dejar de seguir" +msgstr "Deshacer la republicación ({0, plural, one {# republicación} other {# republicaciones}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Dejar de seguir a {0}" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "No me gusta" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "No me gusta ({0, plural, one {# me gusta} other {# me gusta}})" @@ -10409,16 +9823,8 @@ msgstr "Dado de baja de la lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contenido sexual no deseado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Carga un archivo de texto en:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Subir desde la cámara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Subir desde tus archivos" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Subir desde la biblioteca" @@ -10494,7 +9900,7 @@ msgstr "Subiendo imágenes..." msgid "Uploading link thumbnail..." msgstr "Subiendo miniatura del enlace..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Subiendo video..." @@ -10748,7 +10154,7 @@ msgstr "Video no encontrado." msgid "Video settings" msgstr "Configuración del video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video subido" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ver el avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Ver la entrada del blog para más detalles" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver entrada de depuración" +msgstr "Ver entrada de depuración<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ver detalles" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Ver perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Ver el avatar" @@ -10890,15 +10291,10 @@ msgstr "Ver tus cuentas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver tus verificaciones" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Ver tus verificaciones<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Muestra la imagen a tamaño completo" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Lo sentimos, pero no pudimos resolver esta lista. Si esto persiste, por msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Lo sentimos, pero no pudimos cargar tus palabras silenciadas en este momento. Por favor, inténtalo de nuevo." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Lo sentimos, pero no se ha podido completar tu búsqueda. Inténtalo de nuevo en unos minutos." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "¿Por qué crees que este usuario debe ser revisado?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/eu/messages.po b/src/locale/locales/eu/messages.po index cc43bbb4a..ffb864791 100644 --- a/src/locale/locales/eu/messages.po +++ b/src/locale/locales/eu/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {jarraitzaile} other {jarraitzaile}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {jarraitzen} other {jarraitzen}}" +msgstr "{0, plural, one {jarraitzen} other {jarraitzen}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {gogoko} other {gogoko}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {post} other {post}}" +msgstr "{0, plural, one {post} other {post}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {aipamen} other {aipamen}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {berpost} other {berpost}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {aipamen} other {aipamen}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {berpost} other {berpost}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {gordea} other {gordeta}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# gehiago}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Kontua)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}-etan" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Hasi saioa<1> edo <2>sortu kontu bat<3> <4>Bluesky-n gertatzen den guztia, berriak, kirolak, politika eta abar bilatzeko." @@ -587,11 +567,7 @@ msgstr "Honi buruz" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Jokabide abusiboa edo diskriminatzailea" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Erabilerraztasun" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Erabilerraztasun Doikuntzak" +msgstr "Erabilerraztasun Doikuntzak<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Kontua" +msgstr "Kontua<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Kontua blokeatuta" @@ -669,26 +634,18 @@ msgstr "Kontua Mututua Zerrendagatik" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontuaren aukerak" +msgstr "Kontuaren aukerak<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Kontua ezabatua sarrera azkarretik" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Kontua desblokeatuta" @@ -778,7 +735,7 @@ msgstr "Gehitu beste kontu bat" msgid "Add another post" msgstr "Gehitu beste post bat" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Gehitu beste post bat harira" @@ -889,20 +846,12 @@ msgstr "Heldua" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Eduki heldua" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Eduki heldua" @@ -921,11 +870,7 @@ msgstr "Eduki Heldu etiketak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Helduentzako sexu-abusuen edukia" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Bluesky-k egiaztatzaile fidagarriak hautatzen dituela erakusten duen ilustrazio bat, eta egiaztatzaile fidagarriek, berriz, erabiltzaile-kontuak egiaztatzen dituztela." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Aukera hauetan sartzen ez den arazo bat" @@ -1171,19 +1112,11 @@ msgstr "eta" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Animalien sexu-abusua" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Animalien ongizatea" ->>>>>>> upstream/main +msgstr "Animalien ongizatea>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Iragarpena" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky-n egiaztapena iragartzen" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Gizartearen Aurkako Portaera" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Bluesky-n egiaztapena iragartzen<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Aplikazioaren pasahitzaren izenek 4 karaktere izan behar dituzte gutxien #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Aplikazio pasahitzak" +msgstr "Aplikazio pasahitzak<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Aplikazio Pasahitzak" @@ -1307,19 +1225,12 @@ msgstr "Apelazioa Geldiarazi" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelatu erabaki hau" +msgstr "Apelatu erabaki hau<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Itxura" @@ -1331,23 +1242,14 @@ msgstr "Aplikatu gomendatutako feed lehenetsiak" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplikatu Tira Eskaera" +msgstr "Aplikatu Tira Eskaera<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0}-tik artxibatuta" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0}-tik artxibatuta" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Gordetako posta" @@ -1416,18 +1318,11 @@ msgstr "Algoritmoari gaia esleitu" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Gutxienez 8 karaktere" +msgstr "Gutxienez 8 karaktere<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Eskuragarri" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Eskuragarri" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Itzuli Txatetara" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Debekatutako jarduerak edo segurtasun-urraketak" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Debekatutako erabiltzailea itzultzen" ->>>>>>> upstream/main +msgstr "Debekatutako erabiltzailea itzultzen>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Bete beheko eremuak adinaren berme prozesua hasteko." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Urtebetetzea" +msgstr "Urtebetetzea<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blokeatu" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Kontua blokeatu" @@ -1579,15 +1446,8 @@ msgstr "Kontuak blokeatu" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokeatu eta Ezabatu" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blokeatu eta/edo ezabatu elkarrizketa hau" +msgstr "Blokeatu eta Ezabatu<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blokeo zerrenda" @@ -1607,18 +1467,14 @@ msgstr "Blokeatu erabiltzailea" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blokeatu Erabiltzailea" +msgstr "Blokeatu Erabiltzailea<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Blokeatu erabiltzailea eta/edo ezabatu elkarrizketa hau" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blokeatua" @@ -1650,40 +1506,18 @@ msgstr "Blokeatzea publikoa da. Blokeatutako kontuek ezin dute zure harietan era #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blokeatzeak ez du eragotziko etiketak zure kontuan aplikatzea, baina kontu honek zure harietan erantzutea edo zurekin elkarreragitea eragotziko du." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky-k ezin du baieztatu erreklamatutako dataren benetakotasuna." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog-a" +msgstr "Blokeatzeak ez du eragotziko etiketak zure kontuan aplikatzea, baina kontu honek zure harietan erantzutea edo zurekin elkarreragitea eragotziko du.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky-k ezin du baieztatu erreklamatutako dataren benetakotasuna." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky sare ireki bat da, non zure hostatze-hornitzailea aukeratu dezakezun. Garatzailea bazara, zure zerbitzari propioa osta dezakezu." @@ -1735,15 +1569,9 @@ msgstr "Liburuak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Guneko arauak haustea" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Nabigatu kontu gehiagotatik Arakatu orrian" @@ -1854,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Utzi berriro aktibatzea eta amaitu saioa" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Utzi bilaketa" +msgstr "Utzi bilaketa<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Ezin da blokeatutako erabiltzaile batekin elkarreragin" @@ -1955,11 +1771,7 @@ msgstr "Pasahitza aldatzeko elkarrizketa-koadroa" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Txostenaren kategoria aldatu" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Txateatzeko eskaerak" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Egiaztatu zure sarrera-ontzia, baieztapen kodea hartu eta sartu hemen:" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Haurren segurtasuna" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Haurren sexu-abusuari buruzko materiala (CSAM ingelesez)" ->>>>>>> upstream/main +msgstr "Haurren sexu-abusuari buruzko materiala (CSAM ingelesez)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Klip 🐴 klop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Itxi ongietorri modala" msgid "Closes password update alert" msgstr "Pasahitzak eguneratzeko alerta ixten du" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Post-konpositorea ixten du eta post-zirriborroa baztertzen du" @@ -2350,7 +2142,7 @@ msgstr "Idatzi {0, plural, other {# karaktere}} gehienezko postak" msgid "Compose reply" msgstr "Idatzi erantzuna" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Bideoa konprimitzen..." @@ -2472,11 +2264,7 @@ msgstr "Edukia Ez Erabilgarria" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Autolesioak sustatzen edo irudikatzen dituen edukia" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Kopiatu egilearen DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiatu kodea" +msgstr "Kopiatu kodea<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopiatu DID" @@ -2756,7 +2538,7 @@ msgstr "Sortu Kontua" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Sortu kontu bat" @@ -2817,35 +2599,16 @@ msgstr "Pertsonalizatua" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Pertsonalizazio-aukerak" +msgstr "Pertsonalizazio-aukerak<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Pertsonalizatu post honekin nork elkarreragin dezakeen." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Zure Bluesky esperientzia pertsonalizatzen du" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Arrisku handiko erronkak edo jarduerak" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Substantzia arriskutsuak edo drogen gehiegizko kontsumoa" @@ -2854,7 +2617,6 @@ msgstr "Substantzia arriskutsuak edo drogen gehiegizko kontsumoa" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Iluna" @@ -2891,19 +2653,13 @@ msgstr "Arazketa panela" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Helduentzako eduki faltsua" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Lehenetsia" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Ikono lehenetsiak" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Desgaitu 2FA posta elektronikoa" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desgaitu feedback haptikoa" +msgstr "Desgaitu feedback haptikoa<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3182,7 +2926,7 @@ msgstr "Aurkitu Feed Berriak" msgid "Dismiss" msgstr "Baztertu" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Baztertu errorea" @@ -3270,11 +3014,8 @@ msgstr "Ez kezkatu! Mezu eta ezarpen guztiak gordeta daude eta heldua zarela egi #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3322,9 +3063,8 @@ msgstr "Deskargatu Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Deskargatu CAR fitxategia" +msgstr "Deskargatu CAR fitxategia<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3347,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Doxxing-a" ->>>>>>> upstream/main +msgstr "Doxxing-a>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3396,11 +3131,7 @@ msgstr "adib. Iragarkiekin behin eta berriz erantzuten duten erabiltzaileak." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Elikadura-nahasmenduak" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3417,7 +3148,7 @@ msgid "Edit" msgstr "Editatu" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editatu abatarra" @@ -3692,7 +3423,7 @@ msgstr "Pantaila osora sartzen da" msgid "Entertainment" msgstr "Entretenimendua" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Errorea" @@ -3713,11 +3444,11 @@ msgstr "Errore mezua" msgid "Error occurred while saving file" msgstr "Errore bat gertatu da fitxategia gordetzean" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Errore bat gertatu da captcha erantzuna jasotzean." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Errorea: {error}" @@ -3739,19 +3470,8 @@ msgstr "Edonork" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Beste guztia" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Gehiegizko aipamenak edo erantzunak" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Gehiegizko mezuak edo nahi ez diren mezuak" +msgstr "Beste guztia<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Baztertu jarraitzen dituzun erabiltzaileak" @@ -3875,11 +3595,7 @@ msgstr "Kanpoko Multimedia Hobespenak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Eduki muturrekoa" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4083,23 +3799,13 @@ msgstr "Ezin izan da handle-a egiaztatu. Mesedez, saiatu berriro." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Kontu faltsua edo bot-a" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Hauteskundeei buruzko informazio faltsua" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feeda" @@ -4240,26 +3946,8 @@ msgstr "Amaitu" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Sasoia" +msgstr "Sasoia<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Beltz laua" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Urdin laua" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Zuri laua" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Malgua" @@ -4270,16 +3958,7 @@ msgstr "Malgua" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Jarraitu" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Jarraitu" @@ -4322,16 +4001,8 @@ msgstr "Jarraitu kontu guztiak" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Jarraitu bueltan" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Jarraitu bueltan" @@ -4371,13 +4042,9 @@ msgstr "Ezagutzen dituzun jarraitzaileak" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Jarraitzen" @@ -4385,16 +4052,11 @@ msgstr "Jarraitzen" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Jarraitzen" +msgstr "Jarraitzen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Jarraitzen {0}" @@ -4481,15 +4143,8 @@ msgstr "Ahaztuta?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Askatu zure feeda" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Nahi ez den edukia maiz argitaratzen du" +msgstr "Askatu zure feeda<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Nondik" @@ -4590,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Eman aurpegia zure profilari" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Legearen edo zerbitzu-baldintzen urraketa nabarmenak" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Indarkeriaren gorazarrea" ->>>>>>> upstream/main +msgstr "Eman aurpegia zure profilari<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4711,18 +4356,7 @@ msgstr "Multimedia Grafikoa" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "Eduki grafiko bortitza" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4730,8 +4364,7 @@ msgstr "Jokabide harrapari edo grooming-a" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking edo sistema erasoak" ->>>>>>> upstream/main +msgstr "Hacking edo sistema erasoak>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4762,24 +4395,8 @@ msgstr "Haptikoak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Jazarpena, troleoa edo intolerantzia" -======= -msgstr "Jazarpena edo gorrotoa" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Jarduera kaltegarriak edo arrisku handikoak" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Adingabeei kalte egitea edo arriskuan jartzea" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4798,11 +4415,7 @@ msgstr "{tag} traola" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Gorrotozko diskurtsoa" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4811,15 +4424,10 @@ msgstr "Baduzu koderik? <0>Egin klik hemen." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Arazoak dituzu?" +msgstr "Arazoak dituzu?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4878,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ezkutatu pertsonalizazio-aukerak" +msgstr "Ezkutatu pertsonalizazio-aukerak<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ezkutatu posta niretzat" @@ -5014,11 +4613,7 @@ msgstr "Nola ireki behar dugu esteka hau?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Giza trafikoa" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5082,17 +4677,9 @@ msgstr "Garatzailea bazara, zure zerbitzari propioa osta dezakezu." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Zure handle edo posta elektronikoa aldatzen saiatzen ari bazara, egin hori desaktibatu aurretik." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Legez kanpokoa eta Premiazkoa" +msgstr "Zure handle edo posta elektronikoa aldatzen saiatzen ari bazara, egin hori desaktibatu aurretik.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Irudia" @@ -5112,29 +4699,15 @@ msgstr "Irudia gordeta" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Ezin dira irudiak gorde zure argazki liburutegian sartzeko baimena eman ezean." +msgstr "Ezin dira irudiak gorde zure argazki liburutegian sartzeko baimena eman ezean.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Identitate faltsua edo identitateari buruzko erreklamazio faltsua edo afiliazioa" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Identitate faltsua, desinformazioa edo erreklamazio faltsuak" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Imitazioa" ->>>>>>> upstream/main +msgstr "Imitazioa>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5162,15 +4735,8 @@ msgstr "Aplikazioan, Push, Guztiontzat" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Aplikazioan, Push, Jarraitzen duzun jendea" +msgstr "Aplikazioan, Push, Jarraitzen duzun jendea<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mezu desegokiak edo esteka esplizituak" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5198,21 +4764,13 @@ msgstr "Sartu pasahitza kontua ezabatzeko" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Sartu posta elektronikoz bidali zaizun kodea" +msgstr "Sartu posta elektronikoz bidali zaizun kodea<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Elkarrekintza mugatua" @@ -5286,7 +4844,7 @@ msgstr "Oraintxe <0>{0} bakarrik dago! Gehitu jende gehiago zure abio multzo msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Oraintxe bakarrik zaude! Gehitu jende gehiago zure abio multzoari goiko bilaketan." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Lan ID: {0}" @@ -5329,17 +4887,13 @@ msgstr "{0}-k etiketatua." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Egileak etiketatua." +msgstr "Egileak etiketatua.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiketak" @@ -5404,17 +4958,9 @@ msgstr "Gehiago Ikasi" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Adinaren bermeari buruz gehiago ikasi" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Gehiago ikasi Bluesky-ri buruz" +msgstr "Adinaren bermeari buruz gehiago ikasi<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Gehiago ikasi zure PDS auto-hostatzeari buruz." @@ -5449,15 +4995,10 @@ msgstr "Gehiago ikasi Bluesky-n publikoa denari buruz." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Informazio gehiago zure <0>kontuaren ezarpenetan." +msgstr "Informazio gehiago zure <0>kontuaren ezarpenetan.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Ikasi gehiago." @@ -5521,11 +5062,7 @@ msgid "Like" msgstr "Gogoko" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Gogoko ({0, plural, one {gogoko #} other {# gogoko}})" @@ -5588,13 +5125,9 @@ msgstr "Zure berposten gustokoak" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Zure berpost jakinarazpenen gustokoak" +msgstr "Zure berpost jakinarazpenen gustokoak<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Gogoko post honetan" @@ -5898,49 +5431,24 @@ msgstr "Mezuaren aukerak" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mezuak" +msgstr "Mezuak<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Gauerdia" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Adingabe bati jazarpen edo bullying-a" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Hainbat jakinarazpen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Kontu Engainagarria" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Post engainagarria" -======= -msgstr "Engainagarria" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6000,15 +5508,10 @@ msgstr "Moderazio tresnak" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderatzaileak edukiari buruzko abisu orokor bat ezartzea aukeratu du." +msgstr "Moderatzaileak edukiari buruzko abisu orokor bat ezartzea aukeratu du.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Feed gehiago" @@ -6149,18 +5652,8 @@ msgstr "Nire Feedak" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Izena" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Izenak edo Deskribapenak Komunitatearen Arauak Urratzen ditu" - -======= ->>>>>>> upstream/main +msgstr "Izena<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6364,16 +5857,11 @@ msgstr "Irudirik ez" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ez dago gogokorik oraindik" +msgstr "Ez dago gogokorik oraindik<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Jada ez da {0} jarraitzen" @@ -6385,7 +5873,7 @@ msgstr "Oraindik ez dago mezurik" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Zaborrez betetako algoritmo masibo gehiagorik ez. Aurkitu zure alde funtzionatzen duten feedak, ez zure aurka." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Oraindik ez dago jakinarazpenik!" @@ -6439,9 +5927,9 @@ msgstr "Ez da emaitzarik aurkitu" msgid "No results found for \"{query}\"" msgstr "Ez da emaitzarik aurkitu \"{query}\"-rentzat" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Ez da emaitzarik aurkitu {query}-rentzat" @@ -6481,11 +5969,7 @@ msgstr "Ez da inor aurkitu. Saiatu beste norbait bilatzen." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Baimenik gabeko irudi intimoak" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6580,15 +6064,8 @@ msgstr "Orain" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Biluztasuna" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Biluztasuna edo helduentzako edukia ez dago horrela etiketaturik" +msgstr "Biluztasuna<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6609,11 +6086,7 @@ msgid "OK" msgstr "Ados" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Ados" @@ -6714,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Ireki marrazki menua" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Ireki emoji-hautatzailea" @@ -6814,7 +6287,7 @@ msgstr "Konpositorea irekitzen du" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Gailuaren galeria irekitzen du gehienez {MAX_IMAGES, plural, other {# irudi}}, edo bideo edo GIF bakarra hautatzeko." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Emoji-hautatzailea irekitzen du" @@ -6854,15 +6327,10 @@ msgstr "Pasahitza berrezartzeko formularioa irekitzen du" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Postaren hizkuntza ezarpenak irekitzen ditu" +msgstr "Postaren hizkuntza ezarpenak irekitzen ditu<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Profil hau irekitzen du" @@ -6896,12 +6364,7 @@ msgstr "OTA egoera: Ez dago bat ere eskuragarri" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Beste bat" @@ -6911,35 +6374,8 @@ msgstr "Beste kontu bat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Beste haurren segurtasun arazo bat" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Beste eduki arriskutsu batzuk" @@ -6962,8 +6398,7 @@ msgstr "Bestelako sexu-indarkeriazko edukia" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Bestelako eduki bortitza" ->>>>>>> upstream/main +msgstr "Bestelako eduki bortitza>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7039,23 +6474,16 @@ msgstr "@{0}-ri jarraitzen dion jendea" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Jarraitzen ditudan pertsonak" +msgstr "Jarraitzen ditudan pertsonak<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Ukatu egin da zure argazki liburutegira sartzeko baimena. Mesedez, gaitu zure sistemaren ezarpenetan." @@ -7312,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Posteatu" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Posteatu" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Posteatu Dena" @@ -7340,19 +6768,12 @@ msgstr "Posta ezabatuta" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Ezin izan da posta kargatu. Egiaztatu Interneteko konexioa eta saiatu berriro." +msgstr "Ezin izan da posta kargatu. Egiaztatu Interneteko konexioa eta saiatu berriro.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Posta ezabatu da" @@ -7486,13 +6907,9 @@ msgstr "Pribatutasun Politika" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Adingabe baten pribatutasun urraketa" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Bideoa prozesatzen..." @@ -7520,13 +6937,10 @@ msgstr "Profila eguneratu da" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD -======= -msgstr "Debekatutako elementuak edo zerbitzuak sustatzea edo saltzea" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 @@ -7542,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Feedak gidatzeko erabil daitezkeen zerrenda publikoak eta partekagarriak." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Argitaratu posta" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Argitaratu postak" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Argitaratu erantzunak" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Argitaratu erantzuna" @@ -7620,13 +7034,9 @@ msgstr "Post aipamenak desgaituta daude" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Aipamenak" +msgstr "Aipamenak<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Post honen aipamenak" @@ -7687,12 +7097,12 @@ msgstr "Irakurri Bluesky Zerbitzu-Baldintzak" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7783,8 +7193,8 @@ msgstr "Kendu eranskina" msgid "Remove Avatar" msgstr "Kendu Abatarra" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Kendu Bannerra" @@ -7958,17 +7368,13 @@ msgstr "Erantzunak desgaituta daude" msgid "Replies to this post are disabled." msgstr "Mezu honen erantzunak desgaituta daude." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Erantzun" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Erantzuna ({0, plural, one {erantzun #} other {# erantzun}})" @@ -8058,11 +7464,7 @@ msgstr "Salaketa bidalia" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Salatu elkarrizketa hau" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8133,13 +7535,9 @@ msgstr "Zuk berpostatua" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Berpostak" +msgstr "Berpostak<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Berpostatu post hau" @@ -8212,17 +7610,13 @@ msgstr "Berrezarri sartze-egoera" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Berrezarri pasahitza" +msgstr "Berrezarri pasahitza<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Saioa hasi berriro" @@ -8375,28 +7769,21 @@ msgstr "Esan kaixo!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Iruzurra" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Zientzia" +msgstr "Zientzia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Joan ezkerrera" @@ -8441,11 +7828,11 @@ msgstr "Bilatu \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Bilatu \"{interestsDisplayName}\" (aktiboa)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Bilatu \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Bilatu \"{searchText}\"" @@ -8470,7 +7857,7 @@ msgid "Search GIFs" msgstr "Bilatu GIF-ak" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Bilaketa ez dago erabilgarri saioa itxita dagoenean" @@ -8563,11 +7950,7 @@ msgstr "Aukeratu kolore bat" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Aukeratu arrazoi bat" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8704,11 +8087,7 @@ msgstr "Ez da onartzen hainbat euskarri mota hautatzea." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Autolesioak edo jokabide arriskutsuak" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8778,19 +8157,12 @@ msgstr "Ezarri jaiotze-data" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ezarri pasahitz berria" +msgstr "Ezarri pasahitz berria<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Konfiguratu zure kontua" @@ -8942,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9032,15 +8400,10 @@ msgstr "Erakutsi erantzunak" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Erakutsi erantzunak honela" +msgstr "Erakutsi erantzunak honela<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Erakutsi erantzuna guztientzako" @@ -9060,13 +8423,9 @@ msgstr "Erakutsi abisua" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Erakutsi feedetako abisua eta iragazkia" +msgstr "Erakutsi feedetako abisua eta iragazkia<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Post hau noiz sortu zenari buruzko informazioa erakusten du" @@ -9087,7 +8446,7 @@ msgstr "Edukia erakusten du" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9294,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Iturria: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spama" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spama; gehiegizko aipamen edo erantzunak" -======= -msgstr "Spam-a edo bestelako jokabide edo engainu faltsuak" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9467,23 +8813,9 @@ msgstr "Zuretzat proposatua" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Lizuna" +msgstr "Lizuna<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Egunsentia" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Ilunabarra" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9555,11 +8887,7 @@ msgstr "Sakatu baztertzeko" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Jazarpen zuzendua" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9605,18 +8933,8 @@ msgstr "Baldintzak" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Zerbitzu-Baldintzak" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Erabilitako terminoek komunitatearen estandarrak urratzen dituzte" - -======= ->>>>>>> upstream/main +msgstr "Zerbitzu-Baldintzak<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Testua eta etiketak" @@ -9665,11 +8983,7 @@ msgid "That's everything!" msgstr "Hori da dena!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Kontua zurekin elkarreragin ahal izango du desblokeatu ondoren." @@ -9801,17 +9115,12 @@ msgstr "Arazo bat izan da zerbitzariarekin harremanetan jartzeko" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Arazo bat izan da zerbitzariarekin harremanetan jartzeko. Mesedez, egiaztatu Interneteko konexioa eta saiatu berriro." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Arazo bat izan da jakinarazpenak eskuratzean. Sakatu hemen berriro saiatzeko." +msgstr "Arazo bat izan da jakinarazpenak eskuratzean. Sakatu hemen berriro saiatzeko.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Arazo bat izan da postak eskuratzean. Sakatu hemen berriro saiatzeko." @@ -9850,16 +9159,9 @@ msgstr "Arazo bat izan da feedak eguneratzean. Egiaztatu Interneteko konexioa et #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9887,19 +9189,14 @@ msgstr "Aplikazioan ustekabeko arazo bat egon da. Mesedez, esan iezaguzu hau ger #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Erabiltzaile berri mordoa izan da Blueskyra! Zure kontua aktibatuko dugu ahal bezain laster." +msgstr "Erabiltzaile berri mordoa izan da Blueskyra! Zure kontua aktibatuko dugu ahal bezain laster.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10052,13 +9349,9 @@ msgstr "Zerrenda hau hutsik dago." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Moderazio-zerbitzu hau ez dago erabilgarri. Ikus behean xehetasun gehiagorako. Arazo honek jarraitzen badu, jarri gurekin harremanetan." +msgstr "Moderazio-zerbitzu hau ez dago erabilgarri. Ikus behean xehetasun gehiagorako. Arazo honek jarraitzen badu, jarri gurekin harremanetan.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Post honek <0>{0}-n sortu dela dio, baina Bluesky-k <1>{1}-n ikusi zuen lehen aldiz." @@ -10176,11 +9469,7 @@ msgstr "Harien Hobespenak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Mehatxuak edo instigazioa" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10230,17 +9519,10 @@ msgstr "Gaia" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Itzuli" @@ -10259,11 +9541,7 @@ msgstr "Joera Bideoak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling-a" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10366,22 +9644,13 @@ msgstr "Desblokeatu" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desblokeatu kontua" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Kontua Desblokeatu?" @@ -10403,16 +9672,8 @@ msgstr "Desegin berposta" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Desegin berposta ({0, plural, one {berpost #} other {# berpost}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Jarraitzen utzi" +msgstr "Desegin berposta ({0, plural, one {berpost #} other {# berpost}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} jarraitzen utzi" @@ -10440,32 +9701,18 @@ msgstr "Egiaztatzaile ezezaguna" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Helduentzako etiketarik gabeko edukia" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Etiketarik gabeko, abusuzko edo baimenik gabeko helduentzako edukia" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Ez gogoko" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Ez gogoko ({0, plural, one {gogoko #} other {# gogoko}})" @@ -10576,16 +9823,8 @@ msgstr "Zerrendatik harpidetza kenduta" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Bideo mota bateraezina: {mimeType}" +msgstr "Bideo mota bateraezina: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Nahi ez den sexu-edukia" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10635,20 +9874,20 @@ msgstr "Kargatu testu-fitxategi bat hona:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Kargatu Kameratik" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Kargatu Fitxategietatik" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Kargatu Liburutegitik" @@ -10661,7 +9900,7 @@ msgstr "Irudiak kargatzen..." msgid "Uploading link thumbnail..." msgstr "Estekaren miniatura kargatzen..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Bideoa kargatzen..." @@ -10915,7 +10154,7 @@ msgstr "Ez da bideoa aurkitu." msgid "Video settings" msgstr "Bideo ezarpenak" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Bideoa kargatuta" @@ -10940,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Ikusi" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ikusi {0}-ren abatarra" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10966,15 +10209,10 @@ msgstr "Ikusi blogeko argitalpena xehetasun gehiago lortzeko" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ikusi arazketa-sarrera" +msgstr "Ikusi arazketa-sarrera<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ikusi xehetasunak" @@ -11010,10 +10248,6 @@ msgstr "Ikusi posta" msgid "View profile" msgstr "Ikusi profila" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Ikusi abatarra" @@ -11057,15 +10291,10 @@ msgstr "Ikusi zuk mutututako kontuak" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ikusi zure egiaztapenak" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Ikusi zure egiaztapenak<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Irudi osoa ikusten du" @@ -11075,24 +10304,16 @@ msgstr "Bideoa murgiltze moduan ikusten du" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Eduki bortitza edo mehatxagarria>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Indarkeria" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Eduki bortitza edo mehatxagarria" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11242,7 +10463,7 @@ msgstr "Sentitzen dugu, baina ezin izan dugu zerrenda hau konpondu. Honek jarrai msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Sentitzen dugu, baina momentu honetan ezin izan ditugu kargatu zure mutututako hitzak. Mesedez, saiatu berriro." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Sentitzen dugu, baina ezin izan da bilaketa osatu. Mesedez, saiatu berriro minutu batzuk barru." @@ -11343,11 +10564,7 @@ msgstr "Zergatik zaude apelatzen?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Zergatik berrikusi beharko litzateke elkarrizketa hau?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11374,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Zergatik berrikusi behar da erabiltzaile hau?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Erabiltzaile hau blokeatu eta/edo elkarrizketa hau ezabatu nahi duzu?" ->>>>>>> upstream/main +msgstr "Erabiltzaile hau blokeatu eta/edo elkarrizketa hau ezabatu nahi duzu?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11814,11 +11026,7 @@ msgstr "Aplikazioaren pasahitz batekin hasi duzu saioa. Mesedez, hasi saioa zure #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Etiketa honen aurkako helegitea aurkeztu duzu dagoeneko eta gure moderazio taldeak berrikusten ari da." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/fi/messages.po b/src/locale/locales/fi/messages.po index 33fb11b13..413fa469e 100644 --- a/src/locale/locales/fi/messages.po +++ b/src/locale/locales/fi/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seuraaja} other {seuraajaa}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seurattu} other {seurattua}}" +msgstr "{0, plural, one {seurattu} other {seurattua}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {tykkäys} other {tykkäystä}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {julkaisu} other {julkaisua}}" +msgstr "{0, plural, one {julkaisu} other {julkaisua}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {lainaus} other {lainausta}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {uudelleenjulkaisu} other {uudelleenjulkaisua}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {lainaus} other {lainausta}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {uudelleenjulkaisu} other {uudelleenjulkaisua}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} klo {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Saavutettavuus" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Saavutettavuusasetukset" +msgstr "Saavutettavuusasetukset<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Tili" +msgstr "Tili<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Tili estetty" @@ -661,26 +634,18 @@ msgstr "Tili mykistetty listan perusteella" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Tilin valinnat" +msgstr "Tilin valinnat<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Tili poistettu pikakäytöstä" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Tilin esto poistettu" @@ -770,7 +735,7 @@ msgstr "Lisää toinen tili" msgid "Add another post" msgstr "Lisää toinen julkaisu" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Aikuissisältö" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Ongelma, joka ei sisälly näihin vaihtoehtoihin" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Epäsosiaalinen käytös" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Sovellussalasanojen nimien on oltava vähintään 4 merkkiä pitkiä" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Sovellussalasanat" +msgstr "Sovellussalasanat<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Sovellussalasanat" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Valita tästä päätöksestä" +msgstr "Valita tästä päätöksestä<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Ulkoasu" @@ -1307,23 +1242,14 @@ msgstr "Käytä oletusarvoisia suositeltuja syötteitä" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arkistoitu ajankohdasta {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arkistoitu ajankohdasta {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arkistoitu julkaisu" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Syntymäpäivä" +msgstr "Syntymäpäivä<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Estä" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Estä tili" @@ -1546,15 +1446,8 @@ msgstr "Estä tilit" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Estä lista" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Estetty" @@ -1617,40 +1506,18 @@ msgstr "Estäminen on julkista. Estetyt tilit eivät voi vastata ketjuihisi, mai #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Estäminen ei estä merkintöjen asettamista tilillesi, mutta se estää tätä tiliä vastaamasta ketjuihisi tai olemasta muuten vuorovaikutuksessa kanssasi." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky ei voi vahvistaa väitetyn päivämäärän oikeellisuutta." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blogi" +msgstr "Estäminen ei estä merkintöjen asettamista tilillesi, mutta se estää tätä tiliä vastaamasta ketjuihisi tai olemasta muuten vuorovaikutuksessa kanssasi.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky ei voi vahvistaa väitetyn päivämäärän oikeellisuutta." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky on avoin verkosto, jossa voit valita hostauspalveluntarjoajasi. Jos olet kehittäjä, voit hostata omaa palvelintasi." @@ -1702,13 +1569,9 @@ msgstr "Kirjat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Selaa lisää tilejä Explore-sivulla" @@ -1819,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "Peruuta tilin käyttöönpalautus ja kirjaudu ulos" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Peruuta haku" +msgstr "Peruuta haku<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Estetyn käyttäjän kanssa ei voi olla vuorovaikutuksessa" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Kopoti 🐴 kopoti 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Sulkee salasanan päivityshälytyksen" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Laadi vastaus" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Pakataan videota…" @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopioi koodi" +msgstr "Kopioi koodi<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopioi DID" @@ -2705,7 +2538,7 @@ msgstr "Luo tili" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Luo tili" @@ -2766,15 +2599,8 @@ msgstr "Mukautettu" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Mukauta, kuka voi olla vuorovaikutuksessa tämän julkaisun kanssa." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Tumma" @@ -2834,17 +2653,13 @@ msgstr "Vianetsintäpaneeli" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Oletus" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "Oletuskuvakkeet" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Poista sähköpostiin perustuva kaksivaiheinen tunnistautuminen käytös #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Poista haptinen palaute käytöstä" +msgstr "Poista haptinen palaute käytöstä<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Löydä uusia syötteitä" msgid "Dismiss" msgstr "Hylkää" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Hylkää virhe" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Lataa Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Lataa CAR-tiedosto" +msgstr "Lataa CAR-tiedosto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Muokkaa" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Muokkaa profiilikuvaa" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Virhe" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Tiedostoa tallennettaessa tapahtui virhe" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Virhe captcha-vastauksen vastaanottamisessa." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Kaikilta" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Liialliset maininnat tai vastaukset" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Liialliset tai ei-toivotut viestit" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Sulje pois seuraamasi käyttäjät" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Syöte" @@ -4164,26 +3946,8 @@ msgstr "Valmis" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Kuntoilu" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Kuntoilu<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Joustava" @@ -4194,16 +3958,7 @@ msgstr "Joustava" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seuraa" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seuraa" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seuraa takaisin" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seuraa takaisin" @@ -4295,13 +4042,9 @@ msgstr "Tuntemasi seuraajat" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seuratut" @@ -4309,16 +4052,11 @@ msgstr "Seuratut" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seuratut" +msgstr "Seuratut<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Seurataan käyttäjää {0}" @@ -4405,15 +4143,8 @@ msgstr "Unohditko?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Julkaisee usein ei-toivottua sisältöä" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Anna profiilillesi kasvot" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Räikeät lain tai käyttöehtojen rikkomukset" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Anna profiilillesi kasvot<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Haptiikka" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Häirintä, trollaus tai suvaitsemattomuus" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ongelmia?" +msgstr "Ongelmia?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Piilota julkaisu minulta" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Jos yrität vaihtaa käyttäjätunnuksesi tai sähköpostiosoitteesi, tee se ennen kuin poistat tilin käytöstä." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Laiton ja kiireellinen" +msgstr "Jos yrität vaihtaa käyttäjätunnuksesi tai sähköpostiosoitteesi, tee se ennen kuin poistat tilin käytöstä.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Kuva" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Henkilönä esiintyminen taikka väärät väitteet henkilöllisyydestä tai yhteyksistä" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Henkilönä esiintyminen, valetieto tai väärät väitteet" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Sopimattomat viestit tai siveettömät linkit" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Syötä salasana tilin poistoa varten" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Syötä sinulle sähköpostitse lähetetty koodi" +msgstr "Syötä sinulle sähköpostitse lähetetty koodi<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Vuorovaikutusta rajoitettu" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Vain sinä olet nyt tässä! Lisää muita käyttäjiä aloituspakettiisi yllä olevalla haulla." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Työpaikan tunnus: {0}" @@ -5231,17 +4887,13 @@ msgstr "Merkinnyt {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Tekijän merkitsemä." +msgstr "Tekijän merkitsemä.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Merkinnät" @@ -5306,17 +4958,9 @@ msgstr "Lue lisää" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Lue lisää Blueskysta" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Lue lisää PDS:n itse hostaamisesta." @@ -5351,15 +4995,10 @@ msgstr "Lue lisää siitä, mikä on julkista Blueskyssa." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Lue lisää." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Tykkää" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Tykkää ({0, plural, one {# tykkäys} other {# tykkäystä}})" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Tämän julkaisun tykkäykset" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Viestit" +msgstr "Viestit<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Harhaanjohtava tili" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Harhaanjohtava julkaisu" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Moderointityökalut" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderaattori on valinnut asettaa sisällölle yleisen varoituksen." +msgstr "Moderaattori on valinnut asettaa sisällölle yleisen varoituksen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Lisää syötteitä" @@ -6047,18 +5652,8 @@ msgstr "Syötteeni" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nimi" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nimi tai kuvaus rikkoo yhteisön sääntöjä" - -======= ->>>>>>> upstream/main +msgstr "Nimi<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ei vielä tykkäyksiä" +msgstr "Ei vielä tykkäyksiä<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Et enää seuraa käyttäjää {0}" @@ -6283,7 +5873,7 @@ msgstr "Ei vielä viestejä" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ei vielä ilmoituksia!" @@ -6337,9 +5927,9 @@ msgstr "Tuloksia ei löytynyt" msgid "No results found for \"{query}\"" msgstr "Ei tuloksia haulle ”{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Ei tuloksia haulle {query}" @@ -6474,15 +6064,8 @@ msgstr "Nyt" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Alastomuus" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Merkitsemätön alastomuus tai aikuissisältö" +msgstr "Alastomuus<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Selvä" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Avaa alavalikko" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Avaa emojinvalitsin" @@ -6708,7 +6287,7 @@ msgstr "Avaa editorin" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "Avaa salasanan palautuslomakkeen" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Avaa tämän profiilin" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Jokin muu" @@ -6905,23 +6474,16 @@ msgstr "Käyttäjät, jotka seuraavat tiliä @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Julkaise" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Julkaise" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Julkaise kaikki" @@ -7206,19 +6768,12 @@ msgstr "Julkaisu poistettu" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Julkaisun lataaminen palveluun epäonnistui. Tarkista internetyhteytesi ja yritä uudelleen." +msgstr "Julkaisun lataaminen palveluun epäonnistui. Tarkista internetyhteytesi ja yritä uudelleen.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "Tietosuojakäytäntö" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Käsitellään videota…" @@ -7382,19 +6937,12 @@ msgstr "Profiili päivitetty" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Julkinen" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Julkisia, jaettavia listoja, joita voidaan käyttää syötteiden ohjaamiseen." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Lainausjulkaisut poissa käytöstä" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Lainaukset" +msgstr "Lainaukset<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Tämän julkaisun lainaukset" @@ -7553,12 +7097,12 @@ msgstr "Lue Blueskyn käyttöehdot" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Poista liite" msgid "Remove Avatar" msgstr "Poista profiilikuva" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Poista banneri" @@ -7824,17 +7368,13 @@ msgstr "Vastaaminen poissa käytöstä" msgid "Replies to this post are disabled." msgstr "Tähän julkaisuun vastaaminen on poissa käytöstä." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Vastaa" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Vastaa ({0, plural, one {# vastaus} other {# vastausta}})" @@ -7995,13 +7535,9 @@ msgstr "Uudelleenjulkaisit" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Tämän julkaisun uudelleenjulkaisut" @@ -8074,17 +7610,13 @@ msgstr "Nollaa käyttöönoton tila" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Palauta salasana" +msgstr "Palauta salasana<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Tiede" +msgstr "Tiede<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Haku ”{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Haku ”{searchText}”" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Hae GIF-animaatioita" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Aseta syntymäaika" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Aseta uusi salasana" +msgstr "Aseta uusi salasana<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Määritä tilisi" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Näytä vastaukset" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Näytä vastaukset" +msgstr "Näytä vastaukset<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Näytä vastaus kaikille" @@ -8910,13 +8423,9 @@ msgstr "Näytä varoitus" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Näytä varoitus ja suodata syötteistä" +msgstr "Näytä varoitus ja suodata syötteistä<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Roskaposti" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Roskaposti; liialliset maininnat tai vastaukset" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Ehdotuksia sinulle" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Vihjaileva" +msgstr "Vihjaileva<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Ehdot" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Käyttöehdot" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Yhteisön sääntöjä rikkova sanasto" - -======= ->>>>>>> upstream/main +msgstr "Käyttöehdot<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Tekstissä ja tunnisteissa" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Tili voi olla vuorovaikutuksessa kanssasi, kun poistat eston." @@ -9646,17 +9115,12 @@ msgstr "Yhteydenotossa palvelimeen ilmeni ongelma" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Yhteydenotossa palvelimeen ilmeni ongelma. Tarkista internetyhteytesi ja yritä uudelleen." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Ilmoitusten hakemisessa ilmeni ongelma. Napauta tästä yrittääksesi uudelleen." +msgstr "Ilmoitusten hakemisessa ilmeni ongelma. Napauta tästä yrittääksesi uudelleen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Julkaisujen hakemisessa ilmeni ongelma. Napauta tästä yrittääksesi uudelleen." @@ -9695,16 +9159,9 @@ msgstr "Syötteidesi päivityksessä ilmeni ongelma. Tarkista internetyhteytesi #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "Sovelluksessa ilmeni odottamaton ongelma. Kerro meille, jos tämä tapah #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Blueskyyn on tullut paljon uusia käyttäjiä! Aktivoimme tilisi niin pian kuin mahdollista." +msgstr "Blueskyyn on tullut paljon uusia käyttäjiä! Aktivoimme tilisi niin pian kuin mahdollista.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Tämä lista on tyhjä." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Tämä moderointipalvelu ei ole saatavilla. Katso lisätietoja alta. Jos ongelma jatkuu, ota yhteys meihin." +msgstr "Tämä moderointipalvelu ei ole saatavilla. Katso lisätietoja alta. Jos ongelma jatkuu, ota yhteys meihin.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Tämä julkaisu väittää olevansa luotu <0>{0}, mutta ensi kerran se on nähty Blueskyssa <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Aihe" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Käännä" @@ -10203,22 +9644,13 @@ msgstr "Poista esto" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Poista tilin esto" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Poistetaanko tilin esto?" @@ -10240,16 +9672,8 @@ msgstr "Kumoa uudelleenjulkaisu" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Kumoa uudelleenjulkaisu ({0, plural, one {# uudelleenjulkaisu} other {# uudelleenjulkaisua}})" +msgstr "Kumoa uudelleenjulkaisu ({0, plural, one {# uudelleenjulkaisu} other {# uudelleenjulkaisua}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Älä seuraa" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Lopeta käyttäjän {0} seuraaminen" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Älä tykkää" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Älä tykkää ({0, plural, one {# tykkäys} other {# tykkäystä}})" @@ -10407,16 +9823,8 @@ msgstr "Listan tilaus peruutettu" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Ei-toivottu seksuaalinen sisältö" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Lataa tekstitiedosto osoitteeseen" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Lataa kamerasta" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Lataa tiedostoista" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Lataa kirjastosta" @@ -10492,7 +9900,7 @@ msgstr "Ladataan kuvia palveluun…" msgid "Uploading link thumbnail..." msgstr "Ladataan linkin pikkukuvaa palveluun…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Ladataan videota palveluun…" @@ -10746,7 +10154,7 @@ msgstr "Videota ei löydy." msgid "Video settings" msgstr "Videon asetukset" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video ladattu palveluun" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Näytä käyttäjän {0} profiilikuva" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Katso blogijulkaisu saadaksesi lisätietoja" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Näytä vianetsintäkirjaus" +msgstr "Näytä vianetsintäkirjaus<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Näytä lisätietoja" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Näytä profiili" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Näytä profiilikuva" @@ -10888,15 +10291,10 @@ msgstr "Näytä mykistämäsi tilit" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Pahoittelemme, mutta emme onnistuneet resolvoimaan tätä listaa. Jos t msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Pahoittelut, mutta emme tällä kertaa onnistuneet lataamaan mykistettyjä sanojasi. Yritä uudelleen." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Pahoittelut, mutta hakuasi ei voitu suorittaa loppuun. Yritä uudelleen muutaman minuutin kuluttua." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Miksi tämä käyttäjä tulisi arvioida?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po index a7f3da309..1097084ac 100644 --- a/src/locale/locales/fr/messages.po +++ b/src/locale/locales/fr/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {abonné·e} other {abonné·e·s}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {abonnement} other {abonnements}}" +msgstr "{0, plural, one {abonnement} other {abonnements}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {a aimé} other {ont aimé}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {post} other {posts}}" +msgstr "{0, plural, one {post} other {posts}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citation} other {citations}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repost} other {reposts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citation} other {citations}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repost} other {reposts}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {conservé} other {conservés}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, one {+ # autre} other {+ # autres}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (compte)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} à {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Se connecter<1> ou <2>créer un compte<3><4> pour rechercher des actualités, du sport, de la politique, et tout ce qui se passe d’autre en ce moment sur Bluesky." @@ -587,11 +567,7 @@ msgstr "À propos" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportement abusif ou discriminatoire" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Accessibilité" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Paramètres d’accessibilité" +msgstr "Paramètres d’accessibilité<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Compte" +msgstr "Compte<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Compte bloqué" @@ -669,26 +634,18 @@ msgstr "Compte masqué par liste" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Options de compte" +msgstr "Options de compte<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Hébergeur" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Compte supprimé de l’accès rapide" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Compte débloqué" @@ -778,7 +735,7 @@ msgstr "Ajouter un autre compte" msgid "Add another post" msgstr "Ajouter un autre post" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Ajouter un autre post au fil de discussion" @@ -889,20 +846,12 @@ msgstr "Adulte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenu pour adultes" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contenu pour adultes" @@ -921,11 +870,7 @@ msgstr "Étiquettes de contenu adulte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Abus sexuels sur adultes" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Une illustration montrant que Bluesky sélectionne des vérificateurs de confiance, qui à leur tour vérifient des comptes d’utilisateur·ices individuels." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problème qui ne fait pas partie de ces options" @@ -1171,19 +1112,11 @@ msgstr "et" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Abus sexuels sur animaux" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bien-être animal" ->>>>>>> upstream/main +msgstr "Bien-être animal>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Annonce" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "La vérification arrive sur Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportement antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "La vérification arrive sur Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "N’importe qui" ->>>>>>> upstream/main +msgstr "N’importe qui>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Les noms de mots de passe d’application doivent comporter au moins 4 c #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Mots de passe d’application" +msgstr "Mots de passe d’application<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Mots de passe d’application" @@ -1307,19 +1225,12 @@ msgstr "Faire appel de la suspension" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Faire appel de cette décision" +msgstr "Faire appel de cette décision<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Affichage" @@ -1331,23 +1242,14 @@ msgstr "Utiliser les fils d’actu recommandés par défaut" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Appliquer la pull request" +msgstr "Appliquer la pull request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archive datée du {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archive datée du {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Post archivé" @@ -1416,18 +1318,11 @@ msgstr "Assigner un sujet pour l’algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Au moins 8 caractères" +msgstr "Au moins 8 caractères<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurores" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponible" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponible" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Retour aux discussions" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Activités bannies ou problèmes de sécurité" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Retour d’un compte banni" ->>>>>>> upstream/main +msgstr "Retour d’un compte banni>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Commencez la vérification d’âge en complétant les champs ci-dessous #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Date de naissance" +msgstr "Date de naissance<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloquer" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquer le compte" @@ -1579,15 +1446,8 @@ msgstr "Bloquer ces comptes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquer et supprimer" +msgstr "Bloquer et supprimer<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloquer et/ou supprimer cette conversation" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Liste de blocage" @@ -1607,18 +1467,14 @@ msgstr "Bloquer le compte" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquer le compte" +msgstr "Bloquer le compte<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Bloquer ce compte ou supprimer cette conversation" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloqué" @@ -1650,40 +1506,18 @@ msgstr "Le blocage est public. Les comptes bloqués ne peuvent pas répondre à #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Le blocage n’empêchera pas les étiquettes d’être appliquées à votre compte, mais il empêchera ce compte de répondre à vos discussions ou d’interagir avec vous." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky ne peut pas confirmer l’authenticité de la date déclarée." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Le blocage n’empêchera pas les étiquettes d’être appliquées à votre compte, mais il empêchera ce compte de répondre à vos discussions ou d’interagir avec vous.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky ne peut pas confirmer l’authenticité de la date déclarée." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky est un réseau ouvert où vous pouvez choisir votre hébergeur. Si vous êtes développeur, vous pouvez héberger votre propre serveur." @@ -1735,15 +1569,9 @@ msgstr "Livres" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Non-respect des règles du site" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Parcourir d’autres comptes sur la page « Explorer »" @@ -1854,19 +1682,13 @@ msgstr "Caméra" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Annuler la réactivation et se déconnecter" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annuler la recherche" +msgstr "Annuler la recherche<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Impossible d’interagir avec un compte bloqué" @@ -1955,11 +1771,7 @@ msgstr "Fenêtre de modification de mot de passe" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Changer de catégorie de rapport" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Demandes de discussion" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Consultez votre boîte de réception, vous avez du recevoir un e-mail co #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" msgstr "" -======= -msgstr "Protection de l’enfance" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Abus sexuels sur enfants (CSAM)" ->>>>>>> upstream/main +msgstr "Abus sexuels sur enfants (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Cataclop 🐴 cataclop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Fermer la fenêtre de bienvenue" msgid "Closes password update alert" msgstr "Ferme la notification de mise à jour du mot de passe" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Ferme la fenêtre de rédaction et abandonne le brouillon de post" @@ -2350,7 +2142,7 @@ msgstr "Permet d’écrire des posts de {0, plural, other {# caractères}} maxim msgid "Compose reply" msgstr "Rédiger une réponse" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Compression de la vidéo en cours…" @@ -2472,11 +2264,7 @@ msgstr "Contenu non disponible" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenu promouvant ou illustrant de l’automutilation" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copier le DID de l’auteur·ice" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copier ce code" +msgstr "Copier ce code<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copier le DID" @@ -2756,7 +2538,7 @@ msgstr "Créer un compte" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Créer un compte" @@ -2817,35 +2599,16 @@ msgstr "Personnalisé" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Paramètres de personnalisation" +msgstr "Paramètres de personnalisation<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personnalisez les comptes qui peuvent interagir avec ce post." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personnalise votre expérience de Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Activités ou défis dangereux" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Abus de substances dangereuses ou drogues" @@ -2854,7 +2617,6 @@ msgstr "Abus de substances dangereuses ou drogues" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Sombre" @@ -2891,19 +2653,13 @@ msgstr "Panneau de débug" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Deepfake de contenu pour adulte" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Par défaut" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Icônes par défaut" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Désactiver le 2FA par e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Désactiver le retour haptique" +msgstr "Désactiver le retour haptique<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Désactiver complètement les réponses>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Désactiver complètement les réponses" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Découvrir de nouveaux fils d’actu" msgid "Dismiss" msgstr "Ignorer" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Ignorer l’erreur" @@ -3271,11 +3014,8 @@ msgstr "Pas d’inquiétude ! Tous les messages existants et vos paramètres so #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Télécharger Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Télécharger le fichier CAR" +msgstr "Télécharger le fichier CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Divulgation de données personnelles (doxxing)" ->>>>>>> upstream/main +msgstr "Divulgation de données personnelles (doxxing)>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "ex. Les comptes qui répondent toujours avec des pubs." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Troubles alimentaires" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Modifier" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Modifier l’avatar" @@ -3693,7 +3423,7 @@ msgstr "Passe en mode plein écran" msgid "Entertainment" msgstr "Divertissement" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Erreur" @@ -3714,11 +3444,11 @@ msgstr "Message d’erreur" msgid "Error occurred while saving file" msgstr "Échec lors de l’enregistrement du fichier" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Erreur de réception de la réponse captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Erreur : {error}" @@ -3740,19 +3470,8 @@ msgstr "Tout le monde" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Divers" +msgstr "Divers<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mentions ou réponses excessives" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Messages excessifs ou non-sollicités" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Exclure les comptes que vous suivez" @@ -3876,11 +3595,7 @@ msgstr "Préférences sur les médias externes" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenu extrémiste" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "La vérification du pseudo a échoué. Veuillez réessayer." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "Faux compte ou bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Fausses infos concernant des élections" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Fil d’actu" @@ -4241,26 +3946,8 @@ msgstr "Terminer" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Noir plat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Bleu plat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Blanc plat" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexible" @@ -4271,16 +3958,7 @@ msgstr "Flexible" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Suivre" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Suivre" @@ -4323,16 +4001,8 @@ msgstr "Suivre tous les comptes" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Suivre en retour" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Suivre en retour" @@ -4372,13 +4042,9 @@ msgstr "Abonné·e·s que vous connaissez" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Suivi" @@ -4386,16 +4052,11 @@ msgstr "Suivi" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Suivis" +msgstr "Suivis<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Suit {0}" @@ -4482,15 +4143,8 @@ msgstr "Oublié ?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libérez votre fil d’actu" +msgstr "Libérez votre fil d’actu<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publication fréquente de contenu indésirable" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Provenant de" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Donner à votre profil un visage" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violations flagrantes de la loi ou des conditions générales" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorification de la violence" ->>>>>>> upstream/main +msgstr "Donner à votre profil un visage<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Médias crus" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Contenu graphique violent" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Comportement de grooming ou de prédation" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Piratage du site ou attaques du système" ->>>>>>> upstream/main +msgstr "Piratage du site ou attaques du système>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Haptiques" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Harcèlement, trolling ou intolérance" -======= -msgstr "Harcèlement ou haine" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Activités néfastes ou à haut risque" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Nuisible ou mettant en danger des mineurs" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Mot-clé : {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Discours de haine" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Vous avez un code ? <0>Cliquez ici." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Un souci ?" +msgstr "Un souci ?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Masquer les paramètres de personnalisation" +msgstr "Masquer les paramètres de personnalisation<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Masquer les listes" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Cacher ce post pour moi" @@ -5015,11 +4613,7 @@ msgstr "Comment ouvrir ce lien ?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trafic d’êtres humains" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Si vous êtes développeur, vous pouvez héberger votre propre serveur." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si vous essayez de changer de pseudo ou d’adresse e-mail, faites-le avant de désactiver votre compte." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illégal et urgent" +msgstr "Si vous essayez de changer de pseudo ou d’adresse e-mail, faites-le avant de désactiver votre compte.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Image" @@ -5113,29 +4699,15 @@ msgstr "Image enregistrée" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Les images ne peuvent être enregistrées tant qu’une permission d’accès à votre photothèque n’est pas autorisée." +msgstr "Les images ne peuvent être enregistrées tant qu’une permission d’accès à votre photothèque n’est pas autorisée.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Usurpation d’identité ou fausses déclarations concernant l’identité ou l’affiliation" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Usurpation d’identité, désinformation ou fausses déclarations" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Usurpation d’identité" ->>>>>>> upstream/main +msgstr "Usurpation d’identité>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Dans l’app., alertes, de tout le monde" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Dans l’app., alertes, des comptes suivis" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Messages inappropriés ou liens explicites" +msgstr "Dans l’app., alertes, des comptes suivis<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Entrez le mot de passe pour la suppression du compte" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Entrez le code qui vous a été envoyé par e-mail" +msgstr "Entrez le code qui vous a été envoyé par e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaction limitée" @@ -5287,7 +4844,7 @@ msgstr "Il n’y a que <0>{0} pour l’instant ! Ajoutez d’autres personn msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Il n’y a que vous pour l’instant ! Ajoutez d’autres personnes à votre kit de démarrage en effectuant une recherche ci-dessus." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID de job : {0}" @@ -5330,17 +4887,13 @@ msgstr "Étiqueté par {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Étiqueté par l’auteur·ice." +msgstr "Étiqueté par l’auteur·ice.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Étiquettes" @@ -5405,17 +4958,9 @@ msgstr "En savoir plus" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "En savoir plus sur la vérification d’âge" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "En savoir plus sur Bluesky (en anglais)" +msgstr "En savoir plus sur la vérification d’âge<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "En savoir plus sur l’auto-hébergement de PDS (en anglais)." @@ -5450,15 +4995,10 @@ msgstr "En savoir plus sur ce qui est public sur Bluesky (en anglais)." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "En savoir plus dans vos <0>paramètres de compte." +msgstr "En savoir plus dans vos <0>paramètres de compte.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "En savoir plus." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Aimer" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Aimer ({0, plural, one {# ont aimé} other {# ont aimé}})" @@ -5589,13 +5125,9 @@ msgstr "« J’aime » de vos reposts" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifications « J’aime » de vos reposts" +msgstr "Notifications « J’aime » de vos reposts<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Mentions « J’aime » sur ce post" @@ -5899,49 +5431,24 @@ msgstr "Options de message" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages" +msgstr "Messages<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Minuit" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Harcèlement (ou intimidation) d’un mineur" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notifications diverses" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Compte trompeur" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Post trompeur" -======= -msgstr "Trompeur" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Outils de modération" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "La modération a choisi d’ajouter un avertissement général sur le contenu." +msgstr "La modération a choisi d’ajouter un avertissement général sur le contenu.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Plus de fils d’actu" @@ -6150,18 +5652,8 @@ msgstr "Mes fils d’actu" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nom" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nom ou description qui viole les normes communautaires" - -======= ->>>>>>> upstream/main +msgstr "Nom<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Pas d’image" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Pas encore de mentions « j’aime »" +msgstr "Pas encore de mentions « j’aime »<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ne suit plus {0}" @@ -6386,7 +5873,7 @@ msgstr "Pas encore de messages" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Libérez-vous des algorithmes toxiques pleins de contenus nuisibles. Optez pour des fils d’actu qui vous enrichissent au lieu de vous exploiter." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Pas encore de notifications !" @@ -6440,9 +5927,9 @@ msgstr "Aucun résultat trouvé" msgid "No results found for \"{query}\"" msgstr "Aucun résultat trouvé pour « {query} »" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Aucun résultat trouvé pour {query}" @@ -6482,11 +5969,7 @@ msgstr "Personne n’a été trouvé. Essayez de chercher quelqu’un d’autre. #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Imagerie intime sans consentement" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Maintenant" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudité" +msgstr "Nudité<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudité ou contenu adulte non identifié comme tel" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "OK" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Ouvre le menu latéral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Ouvrir le sélecteur d’emoji" @@ -6815,7 +6287,7 @@ msgstr "Ouvre la fenêtre de rédaction" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Ouvre la photothèque pour sélectionner {MAX_IMAGES, plural, one {une image} other {jusqu’à # images}}, une seule vidéo ou un GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Ouvre le sélecteur d’emoji" @@ -6855,15 +6327,10 @@ msgstr "Ouvre le formulaire de réinitialisation du mot de passe" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Ouvre les paramètres de langue du post" +msgstr "Ouvre les paramètres de langue du post<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Ouvre ce profil" @@ -6897,12 +6364,7 @@ msgstr "État des MàJs : Aucune disponible" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Autre" @@ -6912,35 +6374,8 @@ msgstr "Autre compte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Autre problème lié à la protection de l’enfance" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Autre contenu dangereux" @@ -6963,8 +6398,7 @@ msgstr "Autre contenu de violence sexuelle" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Autre contenu violent" ->>>>>>> upstream/main +msgstr "Autre contenu violent>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Personnes qui suivent @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Comptes suivis" +msgstr "Comptes suivis<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Comptes que vous suivez" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Comptes que vous mentionnez" +msgstr "Comptes que vous mentionnez>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Permission d’accès à votre photothèque refusée. Veuillez l’autoriser depuis vos paramètres système." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Poster" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Tout poster" @@ -7341,19 +6768,12 @@ msgstr "Post supprimé" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Échec de l’envoi du post. Vérifiez votre connexion Internet et réessayez." +msgstr "Échec de l’envoi du post. Vérifiez votre connexion Internet et réessayez.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Post supprimé" @@ -7487,13 +6907,9 @@ msgstr "Politique de confidentialité" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Violation de la vie privée d’un mineur" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Traitement de la vidéo en cours…" @@ -7521,15 +6937,11 @@ msgstr "Profil mis à jour" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promotion ou vente de produits ou services interdits" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Au fait ! Vous avez la main sur qui peut interagir avec ce post." ->>>>>>> upstream/main +msgstr "Au fait ! Vous avez la main sur qui peut interagir avec ce post.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listes publiques et partageables de comptes qui peuvent alimenter les fils d’actu." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publier le post" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publier les posts" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publier les réponses" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publier la réponse" @@ -7622,13 +7034,9 @@ msgstr "Citations désactivées" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citations" +msgstr "Citations<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citations de ce post" @@ -7689,12 +7097,12 @@ msgstr "Lire les conditions générales de Bluesky (en anglais)" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Supprimer la pièce jointe" msgid "Remove Avatar" msgstr "Supprimer l’avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Supprimer l’image d’en-tête" @@ -7960,17 +7368,13 @@ msgstr "Les réponses sont désactivées" msgid "Replies to this post are disabled." msgstr "Les réponses à ce post sont désactivées." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Répondre" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Répondre ({0, plural, one {# réponse} other {# réponses}})" @@ -8060,11 +7464,7 @@ msgstr "Signalement envoyé" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Signaler cette conversation" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Republié par vous" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts" +msgstr "Reposts<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Reposts de ce post" @@ -8214,17 +7610,13 @@ msgstr "Réinitialisation du didacticiel" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Réinitialiser mot de passe" +msgstr "Réinitialiser mot de passe<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Réessaye de se connecter" @@ -8377,28 +7769,21 @@ msgstr "Dites bonjour !" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Arnaque" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Science" +msgstr "Science<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Défiler à gauche" @@ -8443,11 +7828,11 @@ msgstr "Recherche de « {interestsDisplayName} »" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Recherche de « {interestsDisplayName} » (actif)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Recherche de « {query} »" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Recherche de « {searchText} »" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Rechercher des GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "La recherche est indisponible en ce moment sans connexion à un compte" @@ -8565,11 +7950,7 @@ msgstr "Sélectionner une couleur" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Sélectionner une raison" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "La sélection de plusieurs types de médias n’est pas prise en charge. #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Automutiliation ou comportement dangereux" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Entrez votre date de naissance" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Définir un nouveau mot de passe" +msgstr "Définir un nouveau mot de passe<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Définissez précisément quels groupes de personnes peuvent répondre à votre post" +msgstr "Définissez précisément quels groupes de personnes peuvent répondre à votre post>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Créez votre compte" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Afficher les réponses" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Type d’affichage des réponses" +msgstr "Type d’affichage des réponses<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Afficher la réponse pour tout le monde" @@ -9062,13 +8423,9 @@ msgstr "Afficher l’avertissement" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Afficher l’avertissement et filtrer des fils d’actu" +msgstr "Afficher l’avertissement et filtrer des fils d’actu<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Affiche plus d’informations sur la date de création de ce post" @@ -9089,7 +8446,7 @@ msgstr "Affiche le contenu" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Source : <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam ; mentions ou réponses excessives" -======= -msgstr "Spam, comportements inauthentiques ou déceptifs" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Suggérés pour vous" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestif" +msgstr "Suggestif<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Lever du soleil" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Coucher du soleil" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Appuyer pour annuler" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Harcèlement ciblé" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Conditions générales" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Conditions générales" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Termes utilisés qui violent les normes de la communauté" +msgstr "Conditions générales<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texte et mots-clés" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "C’est tout !" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Ce compte pourra interagir avec vous après le déblocage." @@ -9803,17 +9115,12 @@ msgstr "Il y a eu un problème de connexion au serveur" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Il y a eu un problème de connexion au serveur, vérifiez votre connexion Internet et réessayez." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Il y a eu un problème lors de la récupération des notifications. Appuyez ici pour réessayer." +msgstr "Il y a eu un problème lors de la récupération des notifications. Appuyez ici pour réessayer.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Il y a eu un problème lors de la récupération des posts. Appuyez ici pour réessayer." @@ -9852,16 +9159,9 @@ msgstr "Il y a eu un problème lors de la mise-à-jour de vos fils d’actu. Vé #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Un problème inattendu s’est produit dans l’application. N’hésite #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Il y a eu un afflux de nouveaux personnes sur Bluesky ! Nous activerons ton compte dès que possible." +msgstr "Il y a eu un afflux de nouveaux personnes sur Bluesky ! Nous activerons ton compte dès que possible.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Ce sont vos paramètres par défaut" ->>>>>>> upstream/main +msgstr "Ce sont vos paramètres par défaut>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Cette liste est vide." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Ce service de modération n’est pas disponible. Voir ci-dessous pour plus de détails. Si le problème persiste, contactez-nous." +msgstr "Ce service de modération n’est pas disponible. Voir ci-dessous pour plus de détails. Si le problème persiste, contactez-nous.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Ce post déclare avoir été créé le <0>{0}, mais a été vu pour la première fois par Bluesky le <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Préférences des fils de discussion" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Menaces ou incitation à la haine" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Sujet" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traduire" @@ -10262,11 +9541,7 @@ msgstr "Vidéos tendances" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Débloquer" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Débloquer le compte" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Débloquer le compte ?" @@ -10406,16 +9672,8 @@ msgstr "Annuler le repost" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Annuler le repost ({0, plural, one {# repost} other {# reposts}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Se désabonner" +msgstr "Annuler le repost ({0, plural, one {# repost} other {# reposts}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Se désabonner de {0}" @@ -10443,32 +9701,18 @@ msgstr "Vérificateur inconnu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Contenu pour adultes sans étiquette" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Sans étiquette, abusif ou sans consentement" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Retirer la mention « J’aime »" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Retirer la mention « J’aime » ({0, plural, one {# ont aimé} other {# ont aimé}})" @@ -10579,16 +9823,8 @@ msgstr "Désabonné de la liste" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Type de vidéo non pris en charge : {mimeType}" +msgstr "Type de vidéo non pris en charge : {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contenu sexuel non désiré" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Envoyer un fichier texte vers :" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Envoyer à partir de l’appareil photo" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Envoyer à partir de fichiers" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Envoyer à partir de la photothèque" @@ -10664,7 +9900,7 @@ msgstr "Envoi des images en cours…" msgid "Uploading link thumbnail..." msgstr "Envoi de la miniature du lien en cours…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Envoi de la vidéo en cours…" @@ -10918,7 +10154,7 @@ msgstr "Vidéo non trouvée." msgid "Video settings" msgstr "Paramètres vidéo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Vidéo envoyée" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Voir" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Voir l’avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Voir l’article de blog (en anglais) pour plus de détails" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Afficher l’entrée de débogage" +msgstr "Afficher l’entrée de débogage<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Voir les détails" @@ -11013,10 +10248,6 @@ msgstr "Voir le post" msgid "View profile" msgstr "Voir le profil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Afficher l’avatar" @@ -11060,15 +10291,10 @@ msgstr "Consulter vos comptes masqués" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Voir vos vérifications" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Voir vos vérifications<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Affiche l’image complète" @@ -11078,24 +10304,16 @@ msgstr "Affiche la vidéo en mode immersif" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Contenu violent ou menaçant>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violence" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Contenu violent ou menaçant" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Nous sommes désolés, mais nous n’avons pas pu charger cette liste. S msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Nous sommes désolés, mais nous n’avons pas pu charger vos mots masqués pour le moment. Veuillez réessayer." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Nous sommes désolés, mais votre recherche a été annulée. Veuillez réessayer dans quelques minutes." @@ -11346,11 +10564,7 @@ msgstr "Pourquoi faites-vous appel ?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Pourquoi cette conversation devrait-elle être examinée ?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Pourquoi ce compte doit-il être examiné ?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Souhaitez-vous bloquer ce compte ou supprimer cette conversation ?" ->>>>>>> upstream/main +msgstr "Souhaitez-vous bloquer ce compte ou supprimer cette conversation ?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Vous êtes connecté·e avec un mot de passe d’application. Connectez- #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Vous avez déjà fait appel de cet étiquetage, qui sera réévalué par notre équipe de modération." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/fy/messages.po b/src/locale/locales/fy/messages.po index c5b89edab..5e58c0821 100644 --- a/src/locale/locales/fy/messages.po +++ b/src/locale/locales/fy/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {folger} other {folgers}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {folgjend} other {folgjend}}" +msgstr "{0, plural, one {folgjend} other {folgjend}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {mei-’k-wol-oer} other {mei-’k-wol-oers}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {berjocht} other {berjochten}}" +msgstr "{0, plural, one {berjocht} other {berjochten}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {sitaat} other {sitaten}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {opnij pleatsing} other {opnij pleatsingen}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {sitaat} other {sitaten}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {opnij pleatsing} other {opnij pleatsingen}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} om {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Meld dy oan<1>of <2>meitsje in account oan<3><4>om te sykjen nei nijs, sport, polityk en al wat der op Bluesky bart." @@ -611,30 +595,19 @@ msgstr "Tagonklikheid" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tagonklikheidsynstellingen" +msgstr "Tagonklikheidsynstellingen<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account" +msgstr "Account<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Account blokkearre" @@ -661,26 +634,18 @@ msgstr "Account negearre troch list" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Accountopsjes" +msgstr "Accountopsjes<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Account út flugge tagong fuortsmiten" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Account deblokkearre" @@ -770,7 +735,7 @@ msgstr "Noch in account tafoegje" msgid "Add another post" msgstr "Noch in berjocht tafoegje" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Ynhâld foar folwoeksenen" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "In yllustraasje, dy’t toant dat Bluesky fertroude ferifiearders selektearret en dizze wer inkelde brûkersaccounts ferifiearje." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "In probleem net fermeld yn dizze opsjes" @@ -1177,21 +1134,11 @@ msgstr "Meidieling" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Oankundiging fan ferifikaasje op Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Asosjaal gedrach" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Oankundiging fan ferifikaasje op Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "App-wachtwurdnammen moatte minimaal 4 tekens lang wêze" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App-wachtwurden" +msgstr "App-wachtwurden<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "App-wachtwurden" @@ -1283,19 +1225,12 @@ msgstr "Beswier tsjin skorsing meitsje" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Beswier tsjin dizze beslissing meitsje" +msgstr "Beswier tsjin dizze beslissing meitsje<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Werjefte" @@ -1307,23 +1242,14 @@ msgstr "Standert oanrekommandearre feeds brûke" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Pull-fersyk tapasse" +msgstr "Pull-fersyk tapasse<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Argivearre fan {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Argivearre fan {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Argivearre berjocht" @@ -1392,18 +1318,11 @@ msgstr "Underwerp foar algoritme tawize" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "Beskikber" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "Beskikber" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "Start it leeftiidsferifikaasjeproses troch de ûndersteande fjilden yn t #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Jierdei" +msgstr "Jierdei<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blokkearje" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Account blokkearje" @@ -1547,15 +1446,8 @@ msgstr "Accounts blokkearje" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokkearje en fuortsmite" +msgstr "Blokkearje en fuortsmite<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Dit petear blokkearje en/of fuortsmite" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blokkearlist" @@ -1575,18 +1467,14 @@ msgstr "Brûker blokkearje" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Brûker blokkearje" +msgstr "Brûker blokkearje<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blokkearre" @@ -1618,40 +1506,18 @@ msgstr "Blokkearjen is iepenbier. Blokkearre accounts kinne net reagearje op dyn #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blokkearjen sil dizze labels net fan dyn account ôfhelje, mar it soarget der wol foar dat dizze brûker net mear op dyn petearen reagearje kin of op oare wize mei dy yn kommunisearje kin." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky kin de wierheid fan dizze datum net befêstigje." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blokkearjen sil dizze labels net fan dyn account ôfhelje, mar it soarget der wol foar dat dizze brûker net mear op dyn petearen reagearje kin of op oare wize mei dy yn kommunisearje kin.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky kin de wierheid fan dizze datum net befêstigje." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky is in iepen netwurk dêr’tsto sels dyn hostingprovider útsykje kinst. Asto in ûntwikkeler bist, kinsto dyn eigen server hoste." @@ -1703,13 +1569,9 @@ msgstr "Boeken" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Blêdzje troch brûkers op de ûntdekkingsside" @@ -1820,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Weraktivearring annulearje en ôfmelde" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Sykopdracht annulearje" +msgstr "Sykopdracht annulearje<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Do kinst net yn kontakt komme mei in blokkearre brûker" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Chatfersiken" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Klik 🐴 klak 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Slút warskôging foar bywurkjen wachtwurd" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Slút opstellen berjocht en negearret konsept" @@ -2304,7 +2142,7 @@ msgstr "Do kinst berjochten opstelle mei in lingte fan maksimaal {0, plural, oth msgid "Compose reply" msgstr "Antwurd opstelle" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Fideo komprimearje…" @@ -2534,17 +2372,11 @@ msgstr "Auteur-DID kopiearje" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Koade kopiearje" +msgstr "Koade kopiearje<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID kopiearje" @@ -2706,7 +2538,7 @@ msgstr "Registrearje" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "In account oanmeitsje" @@ -2767,15 +2599,8 @@ msgstr "Oanpast" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Oanpassingsopsjes" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Pas oan wa’t reagearje kin op dit berjocht." +msgstr "Oanpassingsopsjes<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Past dyn Bluesky-ûnderfining oan" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Tsjuster" @@ -2835,17 +2653,13 @@ msgstr "Paniel debugge" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Standert" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Standert piktogrammen" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "E-mail-2FA útskeakelje" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Fielbere feedback útskeakelje" +msgstr "Fielbere feedback útskeakelje<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Nije feeds ûntdekke" msgid "Dismiss" msgstr "Slute" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Flater negearje" @@ -3212,11 +3014,8 @@ msgstr "Meitsje dy gjin soargen! Alle besteande berjochten en ynstellingen wurde #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Bluesky downloade" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR-bestân downloade" +msgstr "CAR-bestân downloade<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Bewurkje" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Avatar bewurkje" @@ -3627,7 +3423,7 @@ msgstr "Iepenet folslein skerm" msgid "Entertainment" msgstr "Ferdivedaasje" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Flater" @@ -3648,11 +3444,11 @@ msgstr "Flaterberjocht" msgid "Error occurred while saving file" msgstr "Der is in flater bard by it bewarjen fan it bestân" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Flater by ûntfangen fan captcha-antwurd." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Flater: {error}" @@ -3674,19 +3470,8 @@ msgstr "Elkenien" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Al it oare" +msgstr "Al it oare<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Oermjittich protte fermeldingen of antwurden" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Oermjittich of net-winske priveeberjochten" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Brûkers útslute dy’tsto folgest" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4165,26 +3946,8 @@ msgstr "Foltôgje" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Plat swart" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Plat blau" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Plat wyt" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Fleksibel" @@ -4195,16 +3958,7 @@ msgstr "Fleksibel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Folgje" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Folgje" @@ -4247,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Weromfolgje" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Weromfolgje" @@ -4296,13 +4042,9 @@ msgstr "Folgers dy’tsto kinst" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Folgjend" @@ -4310,16 +4052,11 @@ msgstr "Folgjend" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Folgjend" +msgstr "Folgjend<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Folget {0}" @@ -4406,15 +4143,8 @@ msgstr "Ferjitten?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publisearret faak net-winske ynhâld" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Fan" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Jou dyn profyl in gesicht" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Dúdlike oertrêdingen fan de wet of tsjinstbetingsten" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Jou dyn profyl in gesicht<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Haptyske feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Pesterijen, trolling of yntolerânsje" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "Hasto in koade? <0>Klik hjir." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Hasto problemen?" +msgstr "Hasto problemen?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Oanpassingsopsjes ferstoppe" +msgstr "Oanpassingsopsjes ferstoppe<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Berjocht foar my ferstopje" @@ -4985,17 +4677,9 @@ msgstr "Asto in ûntwikkeler bist, kinsto dyn eigen server hoste." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Asto dyn handle of e-mailadres probearrest te wizigjen, doch dit dan eardatsto de-aktivearrest." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Yllegaal en driuwend" +msgstr "Asto dyn handle of e-mailadres probearrest te wizigjen, doch dit dan eardatsto de-aktivearrest.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Ofbylding" @@ -5015,29 +4699,15 @@ msgstr "Ofbylding bewarre" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Ofbyldingen kinne net bewarre wurden, útsein as der tastimming is foar tagong ta dyn fotobiblioteek." +msgstr "Ofbyldingen kinne net bewarre wurden, útsein as der tastimming is foar tagong ta dyn fotobiblioteek.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Imitaasje fan identiteit of falske bewearingen oer identiteit of affiliaasje" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Imitaasje fan identiteit, ferkearde ynformaasje of falske bewearingen" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "Yn-app, pushberjocht, elkenien" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Yn-app, pushberjocht, minsken dy’tsto folgest" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Unpaslike priveeberjochten of eksplisite keppelingen" +msgstr "Yn-app, pushberjocht, minsken dy’tsto folgest<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Fier wachtwurd yn foar fuortsmiten account" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Fer de koade yn dy’t nei dy e-maild is" +msgstr "Fer de koade yn dy’t nei dy e-maild is<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Ynteraksje beheind" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Do bist no noch de iennige! Foegje mear persoanen ta oan dyn startpakket troch hjirboppe te sykjen." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Taak-ID: {0}" @@ -5232,17 +4887,13 @@ msgstr "Labele troch {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Labele troch de auteur." +msgstr "Labele troch de auteur.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Labels" @@ -5307,17 +4958,9 @@ msgstr "Mear ynfo" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Mear ynfo oer leeftiidsferifikaasje" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Mear ynfo oer Bluesky" +msgstr "Mear ynfo oer leeftiidsferifikaasje<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Mear ynfo oer it sels hosten fan dyn PDS." @@ -5352,15 +4995,10 @@ msgstr "Mear ynfo oer wat iepenbier is op Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Mear ynformaasje yn dyn <0>accountynstellingen." +msgstr "Mear ynformaasje yn dyn <0>accountynstellingen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Mear ynfo." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Mei ’k wol oer" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Mei ’k wol oer ({0, plural, one {# mei-’k-wol-oer} other {# mei-’k-wol-oers}})" @@ -5491,13 +5125,9 @@ msgstr "Mei-’k-wol-oers fan dyn opnij-pleatsingen" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Meldingen oer mei-’k-wol-oers fan dyn opnij-pleatsingen" +msgstr "Meldingen oer mei-’k-wol-oers fan dyn opnij-pleatsingen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Mei-’k-wol-oers op dit berjocht" @@ -5801,45 +5431,23 @@ msgstr "Berjochtopsjes" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Berjochten" +msgstr "Berjochten<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Middernacht" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Ferskate meldingen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Misliedende account" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Misliedend berjocht" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Moderaasje-ark" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "De moderator hat derfoar keazen om in algemiene warskôging yn te stellen foar de ynhâld." +msgstr "De moderator hat derfoar keazen om in algemiene warskôging yn te stellen foar de ynhâld.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mear feeds" @@ -6049,18 +5652,8 @@ msgstr "Myn feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Namme" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Namme of omskriuwing skeint mienskipsnoarmen" - -======= ->>>>>>> upstream/main +msgstr "Namme<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "Gjin ôfbylding" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Noch gjin mei-’k-wol-oers" +msgstr "Noch gjin mei-’k-wol-oers<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Do folgest {0} net mear" @@ -6285,7 +5873,7 @@ msgstr "Noch gjin berjochten" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Noch gjin meldingen!" @@ -6339,9 +5927,9 @@ msgstr "Gjin resultaten fûn" msgid "No results found for \"{query}\"" msgstr "Gjin resultaten fûn foar ‘{query}’" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Gjin resultaten fûn foar {query}" @@ -6476,15 +6064,8 @@ msgstr "No" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Neakens" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Neakens of ynhâld foar folwoeksenen dy’t net as sadanich labele is" +msgstr "Neakens<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Oké" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Menu iepenje" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Emoji-kiezer iepenje" @@ -6710,7 +6287,7 @@ msgstr "Iepenet composer" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Iepenet de emoji-kiezer" @@ -6750,15 +6327,10 @@ msgstr "Iepenet formulier om it wachtwud opnij yn te stellen" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Iepenet dit profyl" @@ -6792,12 +6364,7 @@ msgstr "OTA-status: Neat beskikber" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Oars" @@ -6907,23 +6474,16 @@ msgstr "Persoanen dy’t @{0} folgje" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Minsken dy’t ik folgje" +msgstr "Minsken dy’t ik folgje<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Tagong ta dyn fotobiblioteek is wegere. Skeakelje dit yn dyn systeemynstellingen yn." @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Berjocht" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Pleatse" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Alles pleatse" @@ -7208,19 +6768,12 @@ msgstr "Berjocht fuortsmiten" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Berjocht kin net opladen wurde. Kontrolearje dyn ynternetferbining en probearje it opnij." +msgstr "Berjocht kin net opladen wurde. Kontrolearje dyn ynternetferbining en probearje it opnij.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Berjocht is fuortsmiten" @@ -7356,7 +6909,7 @@ msgstr "Privacybelied" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Fideo ferwurkje…" @@ -7384,19 +6937,12 @@ msgstr "Profyl bywurke" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Iepenbier" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Iepenbiere, dielbere listen dy’t brûkt wurde kinne om reklame te meitsjen." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Berjocht pleatse" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Berjochten pleatse" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Antwurden publisearje" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Antwurd publisearje" @@ -7488,13 +7034,9 @@ msgstr "Sitaatberjochten útskeakele" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Sitaten" +msgstr "Sitaten<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Sitaten fan dit berjocht" @@ -7555,12 +7097,12 @@ msgstr "Lês de Bluesky-tsjinstbetingsten" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Bylage fuortsmite" msgid "Remove Avatar" msgstr "Avatar fuortsmite" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Banner fuortsmite" @@ -7826,17 +7368,13 @@ msgstr "Antwurden útskeakele" msgid "Replies to this post are disabled." msgstr "Antwurden op dit berjocht binne útskeakele." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Reagearje" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Beäntwurdzje ({0, plural, one {# antwurd} other {# antwurden}})" @@ -7997,13 +7535,9 @@ msgstr "Opnij pleatst troch dy" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Opnij-pleatsingen" +msgstr "Opnij-pleatsingen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Opnij-pleatsingen fan dit berjocht" @@ -8076,17 +7610,13 @@ msgstr "Yntroduksje-status opnij ynstelle" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Wachtwurd opnij ynstelle" +msgstr "Wachtwurd opnij ynstelle<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Nij besykjen oan te melden" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wittenskip" +msgstr "Wittenskip<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Sykje nei ‘{query}’" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Sykje nei ‘{searchText}’" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF’s sykje" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Sykjen is op dit stuit net beskikber wannear ôfmeld" @@ -8630,19 +8157,12 @@ msgstr "Bertedatum ynstelle" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Nij wachtwurd ynstelle" +msgstr "Nij wachtwurd ynstelle<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Dyn account ynstelle" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Antwurden toane" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Antwurden toane as" +msgstr "Antwurden toane as<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Reaksje foar elkenien toane" @@ -8912,13 +8423,9 @@ msgstr "Warskôging toane" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Warskôging en filter út feeds toane" +msgstr "Warskôging en filter út feeds toane<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Toant ynformaasje oer wannear’t dit bejoicht oanmakke is" @@ -8939,7 +8446,7 @@ msgstr "Toant de ynhâld" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Boarne: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; oermjittich protte fermeldingen of reaksjes" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Foarsteld foar dy" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestyf" +msgstr "Suggestyf<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Sinneopgong" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Sinneûndergong" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Betingsten" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Tsjinstbetingsten" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "De brûkte termen skeine mienskipsnoarmen" - -======= ->>>>>>> upstream/main +msgstr "Tsjinstbetingsten<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Tekst en tags" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Dat wie alles!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "De account kin nei it deblokkearjen mei dy kommunisearje." @@ -9648,17 +9115,12 @@ msgstr "Der is in probleem bard by it ferbinen mei de server" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Der is in probleem bard by it ferbinen mei de server. Kontrolearje dyn ynternetferbining en probearje it opnij." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Der is in probleem bard by it opheljen fan meldingen. Tik hjir om it opnij te probearjen." +msgstr "Der is in probleem bard by it opheljen fan meldingen. Tik hjir om it opnij te probearjen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Der is in probleem bard by it opheljen fan berjochten. Tik hjir om it opnij te probearjen." @@ -9697,16 +9159,9 @@ msgstr "Der is in probleem bard by it bywurkjen fan dyn feeds. Kontrolearje dyn #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Der is in ûnferwacht probleem bard yn de applikaasje. Lit it ús witte #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Der is in grutte oanrin fan nije brûkers nei Bluesky! Wy aktivearje dyn account sa gau as mooglik." +msgstr "Der is in grutte oanrin fan nije brûkers nei Bluesky! Wy aktivearje dyn account sa gau as mooglik.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Dizze list is leech." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Dizze moderaasjetsjinst is net beskikber. Sjoch hjirûnder foar mear details. Nim kontakt mei ús op as dit probleem bliuwt." +msgstr "Dizze moderaasjetsjinst is net beskikber. Sjoch hjirûnder foar mear details. Nim kontakt mei ús op as dit probleem bliuwt.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Dit berjocht beweart makke te wêzen op <0>{0}, mar waard foar it earst sjoen troch Bluesky op <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Underwerp" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Oersette" @@ -10205,22 +9644,13 @@ msgstr "Deblokkearje" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Account deblokkearje" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Account deblokkearje?" @@ -10242,16 +9672,8 @@ msgstr "Opnij pleatsen ûngedien meitsje" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Opnij pleatsen ûngedien meitsje ({0, plural, one {# opnijpleatsing} other {# opnijpleatsingen}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Untfolgje" +msgstr "Opnij pleatsen ûngedien meitsje ({0, plural, one {# opnijpleatsing} other {# opnijpleatsingen}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} ûntfolgje" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Mei ’k net mear oer" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Mei ik net mear oer ({0, plural, one {# mei-’k-net-mear-oer} other {# mei-’k-net-mear-oers}})" @@ -10409,16 +9823,8 @@ msgstr "Fan lis ôfmeld" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Net-winske seksuele ynhâld" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Laad in tekstbestân op nei:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Fan kamera ôf oplade" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Fan bestannen út oplade" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Fan bibloteek út oplade" @@ -10494,7 +9900,7 @@ msgstr "Ofbyldingen oplade…" msgid "Uploading link thumbnail..." msgstr "Keppelingminiatuer oplade…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Fideo oplade…" @@ -10748,7 +10154,7 @@ msgstr "Fideo net fûn." msgid "Video settings" msgstr "Fideo-ynstellingen" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Fideo opladen" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Avatar fan {0} besjen" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Blogartikel foar mear details besjen" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-item besjen" +msgstr "Debug-item besjen<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Details besjen" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Profyl besjen" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Avatar besjen" @@ -10890,15 +10291,10 @@ msgstr "Dyn negearre accounts besjen" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Dyn ferifikaasjes besjen" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Dyn ferifikaasjes besjen<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Toant folsleine ôfbylding" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "It spyt ús, mar wy kinne dizze list net ophelje. Nim kontakt op mei de msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "It spyt ús, mar wy koene dyn negearre wurden op dit stuit net lade. Probearje it opnij." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "It spyt ús, mar dyn sykopdracht kin net foltôge wurde. Probearje it oer in pear minuten opnij." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Wêrom moat dizze brûker beoardiele wurde?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/ga/messages.po b/src/locale/locales/ga/messages.po index 8f38ccda9..568067b00 100644 --- a/src/locale/locales/ga/messages.po +++ b/src/locale/locales/ga/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {leantóir} two {leantóir} few {leantóir} many {leant #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {á leanúint} two {á leanúint} few {á leanúint} many {á leanúint} other {á leanúint}}" +msgstr "{0, plural, one {á leanúint} two {á leanúint} few {á leanúint} many {á leanúint} other {á leanúint}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {moladh} two {mholadh} few {mholadh} many {moladh} other {moladh}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {phostáil} two {phostáil} few {phostáil} many {bpostáil} other {postáil}}" +msgstr "{0, plural, one {phostáil} two {phostáil} few {phostáil} many {bpostáil} other {postáil}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {postáil athluaite} two {phostáil athluaite} few {phostáil athluaite} many {bpostáil athluaite} other {postáil athluaite}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {athphostáil} two {athphostáil} few {athphostáil} many {athphostáil} other {athphostáil}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {postáil athluaite} two {phostáil athluaite} few {phostáil athluaite} many {bpostáil athluaite} other {postáil athluaite}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {athphostáil} two {athphostáil} few {athphostáil} many {athphostáil} other {athphostáil}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} ag {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Inrochtaineacht" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Socruithe Inrochtaineachta" +msgstr "Socruithe Inrochtaineachta<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuntas" +msgstr "Cuntas<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Cuntas blocáilte" @@ -661,26 +634,18 @@ msgstr "Balbhaíodh an Cuntas trí Liosta" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Roghanna cuntais" +msgstr "Roghanna cuntais<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Baineadh an cuntas ón mearliosta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Cuntas díbhlocáilte" @@ -770,7 +735,7 @@ msgstr "Cuir cuntas eile leis" msgid "Add another post" msgstr "Cuir postáil eile leis" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Ábhar do dhaoine fásta" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Rud nach bhfuil ar fáil sna roghanna seo" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Iompar Frithshóisialta" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Caithfidh ainm pasfhocal aipe a bheith ar a laghad ceithre charachtar ar #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Pasfhocail aipe" +msgstr "Pasfhocail aipe<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Pasfhocail aipe" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Déan achomharc i gcoinne an chinnidh seo" +msgstr "Déan achomharc i gcoinne an chinnidh seo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Cuma" @@ -1307,23 +1242,14 @@ msgstr "Bain úsáid as fothaí réamhshocraithe a moladh" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Cartlannaithe ó {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Cartlannaithe ó {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Postáil sa chartlann" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Breithlá" +msgstr "Breithlá<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blocáil" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blocáil an cuntas seo" @@ -1546,15 +1446,8 @@ msgstr "Blocáil na cuntais seo" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocáil agus Scrios" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blocáil agus/nó scrios an comhrá seo" +msgstr "Blocáil agus Scrios<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Liosta blocála" @@ -1574,18 +1467,14 @@ msgstr "Blocáil an t-úsáideoir" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocáil an t-úsáideoir" +msgstr "Blocáil an t-úsáideoir<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blocáilte" @@ -1617,40 +1506,18 @@ msgstr "Tá an bhlocáil poiblí. Ní féidir leis na cuntais bhlocáilte freagr #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Ní chuirfidh blocáil cosc ar lipéid a bheith curtha ar do chuntas, ach bacfaidh sí an cuntas seo ar fhreagraí a thabhairt i do chuid snáitheanna agus ar chaidreamh a dhéanamh leat." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Ní féidir le Bluesky an dáta maíte a dheimhniú." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blag" +msgstr "Ní chuirfidh blocáil cosc ar lipéid a bheith curtha ar do chuntas, ach bacfaidh sí an cuntas seo ar fhreagraí a thabhairt i do chuid snáitheanna agus ar chaidreamh a dhéanamh leat.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Ní féidir le Bluesky an dáta maíte a dheimhniú." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Is líonra oscailte é Bluesky, lenar féidir do sholáthraí óstála féin a roghnú. Más forbróir thú, is féidir leat do fhreastalaí féin a óstáil." @@ -1702,13 +1569,9 @@ msgstr "Leabhair" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Tabhair súil ar thuilleadh cuntas ar an leathanach Taiscéalaíocht" @@ -1819,19 +1682,13 @@ msgstr "Ceamara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cealaigh an cuardach" +msgstr "Cealaigh an cuardach<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Ní féidir plé le húsáideoir blocáilte" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Trup, Trup a Chapaillín 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Dúnann sé seo an rabhadh faoi uasdátú an phasfhocail" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Scríobh freagra" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Físeán á chomhbhrú..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Cóipeáil an cód" +msgstr "Cóipeáil an cód<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Cóipeáil an DID" @@ -2705,7 +2538,7 @@ msgstr "Cruthaigh cuntas" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Cruthaigh cuntas" @@ -2766,15 +2599,8 @@ msgstr "Saincheaptha" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Cé atá in ann idirghníomhú leis an bpostáil seo?" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Dorcha" @@ -2834,17 +2653,13 @@ msgstr "Painéal dífhabhtaithe" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Réamhshocrú" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "Deilbhíní réamhshocraithe" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Ná húsáid 2FA trí ríomhphost" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Ná húsáid aiseolas haptach" +msgstr "Ná húsáid aiseolas haptach<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Aimsigh Fothaí Nua" msgid "Dismiss" msgstr "Ruaig" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Ruaig an earráid" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Íoslódáil Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Íoslódáil comhad CAR" +msgstr "Íoslódáil comhad CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Eagar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Cuir an t-abhatár in eagar" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Earráid" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Tharla earráid le linn comhad a shábháil" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Earráid agus an freagra ar an captcha á phróiseáil." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Chuile dhuine" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "An iomarca tagairtí nó freagraí" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Teachtaireachtaí iomarcacha nó nach bhfuil de dhíth" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Ná cuir i bhfeidhm ar úsáideoirí a leanaim" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Fotha" @@ -4164,26 +3946,8 @@ msgstr "Críochnaigh" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Folláine" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" +msgstr "Folláine<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Solúbtha" @@ -4194,16 +3958,7 @@ msgstr "Solúbtha" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Lean" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Lean" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Lean ar ais" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Lean ar ais" @@ -4295,13 +4042,9 @@ msgstr "Leantóirí a bhfuil aithne agat orthu" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Á leanúint" @@ -4309,16 +4052,11 @@ msgstr "Á leanúint" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Á leanúint" +msgstr "Á leanúint<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Ag leanúint {0}" @@ -4405,15 +4143,8 @@ msgstr "Dearmadta?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Is minic a phostálann siad ábhar nach bhfuil de dhíth" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Tabhair gnúis do do phróifíl" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Deargshárú an dlí nó na dtéarmaí seirbhíse" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Tabhair gnúis do do phróifíl<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Haptaic" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Ciapadh, trolláil, nó éadulaingt" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Fadhb ort?" +msgstr "Fadhb ort?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Cuir an phostáil seo i bhfolach domsa" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Má tá sé i gceist agat do hanla nó ríomhphost a athrú, déan sin sula ndéanann tú díghníomhú." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Mídhleathach agus Práinneach" +msgstr "Má tá sé i gceist agat do hanla nó ríomhphost a athrú, déan sin sula ndéanann tú díghníomhú.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Íomhá" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Pearsanú nó maíomh mícheart maidir le cé atá ann nó a gceangal" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Pearsanú, mífhaisnéis, nó ráitis bhréagacha" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Teachtaireachtaí míchuí nó nascanna graosta" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Cuir isteach an pasfhocal chun an cuntas a scriosadh" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Cuir isteach an cód a chuir muid chugat i dteachtaireacht r-phoist" +msgstr "Cuir isteach an cód a chuir muid chugat i dteachtaireacht r-phoist<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Idirghníomhaíocht teoranta" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Níl ann ach tusa anois! Cuardaigh thuas le tuilleadh daoine a chur le do phacáiste fáilte." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID an Jab: {0}" @@ -5231,17 +4887,13 @@ msgstr "Lipéad curtha ag {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Lipéadaithe ag an údar." +msgstr "Lipéadaithe ag an údar.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Lipéid" @@ -5306,17 +4958,9 @@ msgstr "Le tuilleadh a fhoghlaim" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Tuilleadh eolais maidir le Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Tuilleadh eolais faoi do fhreastalaí pearsanta féin a óstáil." @@ -5351,15 +4995,10 @@ msgstr "Le tuilleadh a fhoghlaim faoi céard atá poiblí ar Bluesky" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Tuilleadh eolais." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Moladh" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Mol ({0, plural, one {# mholadh} two {# mholadh} few {# mholadh} many {# moladh} other {# moladh}})" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Moltaí don phostáil seo" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Teachtaireachtaí" +msgstr "Teachtaireachtaí<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cuntas atá Míthreorach" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Postáil atá Míthreorach" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Uirlisí modhnóireachta" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Chuir an modhnóir rabhadh ginearálta ar an ábhar." +msgstr "Chuir an modhnóir rabhadh ginearálta ar an ábhar.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Tuilleadh fothaí" @@ -6047,18 +5652,8 @@ msgstr "Mo Chuid Fothaí" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ainm" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Sáraíonn an tAinm nó an Cur Síos Caighdeáin an Phobail" - -======= ->>>>>>> upstream/main +msgstr "Ainm<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Gan moladh fós" +msgstr "Gan moladh fós<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ní leantar {0} níos mó" @@ -6283,7 +5873,7 @@ msgstr "Níl aon teachtaireacht ann fós" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Níl aon fhógra ann fós!" @@ -6337,9 +5927,9 @@ msgstr "Gan torthaí" msgid "No results found for \"{query}\"" msgstr "Gan torthaí ar “{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Gan torthaí ar {query}" @@ -6474,15 +6064,8 @@ msgstr "Anois" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Lomnochtacht" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Lomnochtacht nó ábhar do dhaoine fásta nach bhfuil an lipéad sin air" +msgstr "Lomnochtacht<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Maith go leor" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Oscail an roghchlár tarraiceáin" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Oscail roghnóir na n-emoji" @@ -6708,7 +6287,7 @@ msgstr "Osclaíonn sé seo an t-eagarthóir" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "Osclaíonn sé seo an fhoirm leis an bpasfhocal a athrú" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Osclaíonn sé an phróifíl seo" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Eile" @@ -6905,23 +6474,16 @@ msgstr "Na leantóirí atá ag @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postáil" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Postáil" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Postáil Uile" @@ -7206,19 +6768,12 @@ msgstr "Scriosadh an phostáil" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Níor uaslódáladh an phostáil. Seiceáil do cheangal leis an idirlíon agus bain triail eile as." +msgstr "Níor uaslódáladh an phostáil. Seiceáil do cheangal leis an idirlíon agus bain triail eile as.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "Polasaí Príobháideachta" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Físeán á phróiseáil..." @@ -7382,19 +6937,12 @@ msgstr "Próifíl uasdátaithe" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Poiblí" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Liostaí poiblí inroinnte ar féidir leo fothaí a bheathú." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Ní féidir postálacha a athlua" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Postálacha athluaite" +msgstr "Postálacha athluaite<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Postálacha athluaite den phostáil seo" @@ -7553,12 +7097,12 @@ msgstr "Léigh Téarmaí Seirbhíse Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Bain an ceangaltán de" msgid "Remove Avatar" msgstr "Bain an tAbhatár Amach" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Bain an Fógra Meirge Amach" @@ -7824,17 +7368,13 @@ msgstr "Cuireadh bac ar fhreagraí" msgid "Replies to this post are disabled." msgstr "Ní féidir freagraí a thabhairt ar an bpostáil seo." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Freagair" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Freagair ({0, plural, one {# fhreagra} two {# fhreagra} few {# fhreagra} many {# bhfreagra} other {# freagra}})" @@ -7995,13 +7535,9 @@ msgstr "Athphostáilte agat" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Athphostálacha den phostáil seo" @@ -8074,17 +7610,13 @@ msgstr "Athshocraigh an próiseas cláraithe" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Athshocraigh an pasfhocal" +msgstr "Athshocraigh an pasfhocal<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Eolaíocht" +msgstr "Eolaíocht<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Déan cuardach ar “{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Déan cuardach ar \"{searchText}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Cuardaigh GIFanna" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Socraigh do bhreithlá" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Socraigh pasfhocal nua" +msgstr "Socraigh pasfhocal nua<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Socraigh do chuntas" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Taispeáin freagraí" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Taispeáin freagraí mar" +msgstr "Taispeáin freagraí mar<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Taispeáin freagra do chách" @@ -8910,13 +8423,9 @@ msgstr "Taispeáin rabhadh" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Taispeáin rabhadh agus scag ó na fothaí é" +msgstr "Taispeáin rabhadh agus scag ó na fothaí é<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Turscar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Turscar; an iomarca tagairtí nó freagraí" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Molta duit" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Gáirsiúil" +msgstr "Gáirsiúil<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Téarmaí" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Téarmaí Seirbhíse" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Sárú ar chaighdeáin an phobail atá sna téarmaí a úsáideadh" - -======= ->>>>>>> upstream/main +msgstr "Téarmaí Seirbhíse<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Téacs agus clibeanna" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Beidh an cuntas seo in ann caidreamh a dhéanamh leat tar éis duit é a dhíbhlocáil" @@ -9646,17 +9115,12 @@ msgstr "Bhí fadhb ann maidir le teagmháil a dhéanamh leis an bhfreastalaí" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Bhí fadhb ann maidir le teagmháil a dhéanamh leis an bhfreastalaí. Seiceáil do cheangal leis an idirlíon agus bain triail eile as." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Bhí fadhb ann maidir le fógraí a fháil. Tapáil anseo le triail eile a bhaint as." +msgstr "Bhí fadhb ann maidir le fógraí a fháil. Tapáil anseo le triail eile a bhaint as.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Bhí fadhb ann maidir le postálacha a fháil. Tapáil anseo le triail eile a bhaint as." @@ -9695,16 +9159,9 @@ msgstr "Bhí fadhb ann maidir le do chuid fothaí a nuashonrú. Seiceáil do che #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "D’éirigh fadhb gan choinne leis an aip. Abair linn, le do thoil, má #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Tá ráchairt ar Bluesky le déanaí! Cuirfidh muid do chuntas ag obair chomh luath agus is féidir." +msgstr "Tá ráchairt ar Bluesky le déanaí! Cuirfidh muid do chuntas ag obair chomh luath agus is féidir.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Tá an liosta seo folamh." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Níl an tseirbhís modhnóireachta ar fáil. Féach tuilleadh sonraí thíos. Má mhaireann an fhadhb seo, téigh i dteagmháil linn." +msgstr "Níl an tseirbhís modhnóireachta ar fáil. Féach tuilleadh sonraí thíos. Má mhaireann an fhadhb seo, téigh i dteagmháil linn.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Deir an phostáil seo gur cruthaíodh í ar <0>{0}, ach chonacthas í ar Bluesky den chéad uair ar <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Ábhar" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Aistrigh" @@ -10203,22 +9644,13 @@ msgstr "Díbhlocáil" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Díbhlocáil an cuntas" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "An bhfuil fonn ort an cuntas seo a dhíbhlocáil?" @@ -10240,16 +9672,8 @@ msgstr "Cuir stop leis an athphostáil" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Cuir stop leis an athphostáil ({0, plural, one {# athphostáil} two {# athphostáil} few {# athphostáil} many {# n-athphostáil} other {# athphostáil}})" +msgstr "Cuir stop leis an athphostáil ({0, plural, one {# athphostáil} two {# athphostáil} few {# athphostáil} many {# n-athphostáil} other {# athphostáil}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Dílean" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Dílean {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Dímhol" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Dímhol ({0, plural, one {# mholadh} two {# mholadh} few {# mholadh} many {# moladh} other {# moladh}})" @@ -10407,16 +9823,8 @@ msgstr "Dhíliostáil tú ón liosta seo" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Ábhar graosta nach mian liom" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Uaslódáil comhad téacs chuig:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Uaslódáil ó Cheamara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Uaslódáil ó Chomhaid" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Uaslódáil ó Leabharlann" @@ -10492,7 +9900,7 @@ msgstr "Íomhánna á n-uaslódáil..." msgid "Uploading link thumbnail..." msgstr "Mionsamhail á huaslódáil..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Físeán á uaslódáil..." @@ -10746,7 +10154,7 @@ msgstr "Físeán gan aimsiú." msgid "Video settings" msgstr "Socruithe físe" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Uaslódáladh an físeán" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Féach ar an abhatár atá ag {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Féach ar an mblagphost chun tuilleadh eolais a fháil" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Féach ar an iontráil dífhabhtaithe" +msgstr "Féach ar an iontráil dífhabhtaithe<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Féach ar shonraí" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Féach ar an bpróifíl" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Féach ar an abhatár" @@ -10888,15 +10291,10 @@ msgstr "Féach ar na cuntais a bhalbhaigh tú" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Ár leithscéal, ach ní féidir linn an liosta seo a thaispeáint. Má msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Tá brón orainn, ach theip orainn na focail a bhalbhaigh tú a lódáil an uair seo. Bain triail as arís." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Ár leithscéal, ach níorbh fhéidir linn do chuardach a chur i gcrích. Bain triail eile as i gceann cúpla nóiméad." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Cén fáth gur cheart athbhreithniú a dhéanamh ar an úsáideoir seo?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/gd/messages.po b/src/locale/locales/gd/messages.po index b88422c6a..7debf6ecc 100644 --- a/src/locale/locales/gd/messages.po +++ b/src/locale/locales/gd/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {gam leantainn} two {gam leantainn} few {gam leantainn} #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {A’ leantainn #} two {A’ leantainn #} few {A’ leantainn #} other {A’ leantainn #}}" +msgstr "{0, plural, one {A’ leantainn #} two {A’ leantainn #} few {A’ leantainn #} other {A’ leantainn #}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {’s toil le # seo} two {’s toil le # seo} few {’s toil le # seo} other {’s toil le # seo}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {phost} two {phost} few {puist} other {post}}" +msgstr "{0, plural, one {phost} two {phost} few {puist} other {post}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {luaidh} two {luaidh} few {luaidhean} other {luaidh}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {air ath-phostadh} two {air ath-phostadh} few {air ath-phostadh} other {air ath-phostadh}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {luaidh} two {luaidh} few {luaidhean} other {luaidh}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {air ath-phostadh} two {air ath-phostadh} few {air ath-phostadh} other {air ath-phostadh}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {air a shàbhaladh} two {air a shàbhaladh} few {air an sàbhaladh} other {air an sàbhaladh}}" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} aig {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Clàraich a-steach<1> no <2>cruthaich cunntas<3> <4>airson naidheachdan, spòrs, poileataigs is rud sam bith eile a tha a’ dol air Bluesky a lorg." @@ -611,30 +595,19 @@ msgstr "So-ruigsinneachd" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Roghainnean na so-ruigsinneachd" +msgstr "Roghainnean na so-ruigsinneachd<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cunntas" +msgstr "Cunntas<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Chaidh an cunntas a bhacadh" @@ -661,26 +634,18 @@ msgstr "Chaidh an cunntas a mhùchadh le liosta" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Roghainnean a’ chunntais" +msgstr "Roghainnean a’ chunntais<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Chaidh an cunntas a thoirt air falbh on ghrad-inntrigeadh" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Chaidh am bacadh a thoirt far a’ chunntais" @@ -770,7 +735,7 @@ msgstr "Cuir cunntas eile ris" msgid "Add another post" msgstr "Cuir post eile ris" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Cuir post eile ris an t-snàithlean" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Susbaint inbheach" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Dealbh a sheallas gun tagh Bluesky luchd-dearbhaidh earbsach agus gun dearbh an luchd-dearbhaidh earbsach seo cunntasan fa leth aig an luchd-chleachdaidh an uair sin." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Duilgheadas nach eil am measg nan roghainnean seo" @@ -1177,21 +1134,11 @@ msgstr "Fios-naidheachd" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Naidheachd mu dhearbhadh air Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Giùlan ana-shòisealta" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Naidheachd mu dhearbhadh air Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Feumaidh co-dhiù 4 caractaran bhith ann am facal-faire na h-aplacaid" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Faclan-faire nan aplacaidean" +msgstr "Faclan-faire nan aplacaidean<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Faclan-faire nan aplacaidean" @@ -1283,19 +1225,12 @@ msgstr "Tog ath-thagradh an aghaidh na dàlach" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Tog ath-thagradh an aghaidh a’ cho-dhùnaidh seo" +msgstr "Tog ath-thagradh an aghaidh a’ cho-dhùnaidh seo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Coltas" @@ -1307,23 +1242,14 @@ msgstr "Cuir an sàs na h-inbhirean bunaiteach a mholamaid" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Cuir an t-iarrtas pull an gnìomh" +msgstr "Cuir an t-iarrtas pull an gnìomh<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Air a thasglannachadh ann an {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Air a thasglannachadh ann an {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Post tasglannaichte" @@ -1392,18 +1318,11 @@ msgstr "Iomruin cuspair dhan algairim" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Co-dhiù 8 caractaran" +msgstr "Co-dhiù 8 caractaran<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "Ri fhaighinn" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "Ri fhaighinn" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "Tòisich air dearbhadh d’ aoise le bhith a’ lìonadh nan raointean g #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Co-là breith" +msgstr "Co-là breith<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bac" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bac an cunntas" @@ -1547,15 +1446,8 @@ msgstr "Bac cunntasan" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bac is sguab às" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bac agus/no sguab às an còmhradh seo" +msgstr "Bac is sguab às<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Liosta-bhacaidh" @@ -1575,18 +1467,14 @@ msgstr "Bac an cleachdaiche" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bac an cleachdaiche" +msgstr "Bac an cleachdaiche<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bacte" @@ -1618,40 +1506,18 @@ msgstr "’S e gnìomh poblach a th’ ann am bacadh. Chan eil cead aig cunntasa #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Ma nì thu bacadh, ’s urrainn do dhaoine leubailean a chur ris a’ chunntas agad fhathast ach chan urrainn dhaibh freagairt a thoirt sna snàithleanan agad tuilleadh no eadar-ghabhail a dhèanamh leat." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Chan urrainn dha Bluesky dearbhadh gu bheil an ceann-là a thathar a’ cumail a-mach fìor." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Bloga" +msgstr "Ma nì thu bacadh, ’s urrainn do dhaoine leubailean a chur ris a’ chunntas agad fhathast ach chan urrainn dhaibh freagairt a thoirt sna snàithleanan agad tuilleadh no eadar-ghabhail a dhèanamh leat.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Chan urrainn dha Bluesky dearbhadh gu bheil an ceann-là a thathar a’ cumail a-mach fìor." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "’S e lìonra fosgailte a th’ ann am Bluesky far an urrainn dhut solaraiche òstaireachd a thaghadh thu fhèin. Mas e neach-leasachaidh a th’ annad, is urrainn dhut frithealaiche a chur air chois thu fhèin." @@ -1703,13 +1569,9 @@ msgstr "Leabhraichean" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Rùraich barrachd chunntasan air an duilleag “Rùraich”" @@ -1820,19 +1682,13 @@ msgstr "An camara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Sguir dhen ath-ghnìomhachadh is clàraich a-mach" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Sguir dhen lorg" +msgstr "Sguir dhen lorg<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Chan urrainn dhut eadar-ghabhail a dhèanamh le cleachdaiche a bhac thu" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Iarrtasan cabadaich" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Turt 🐴 turt 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "Dùin mòideal an fhàilteachaidh" msgid "Closes password update alert" msgstr "Dùinidh seo caismeachd mu ùrachadh an fhacail-fhaire" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Dùinidh seo an uinneag sgrìobhaidh is tilgidh e air falbh dreachd a’ phuist" @@ -2304,7 +2142,7 @@ msgstr "Sgrìobh puist a bhios suas ri {0, plural, one {# charactar} two {# char msgid "Compose reply" msgstr "Sgrìobh freagairt" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "A’ dùmhlachadh a’ video…" @@ -2534,17 +2372,11 @@ msgstr "Dèan lethbhreac dhe DID an ùghdair" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Dèan lethbhreac dhen chòd" +msgstr "Dèan lethbhreac dhen chòd<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Dèan lethbhreac dhen DID" @@ -2706,7 +2538,7 @@ msgstr "Cruthaich cunntas" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Cruthaich cunntas" @@ -2767,15 +2599,8 @@ msgstr "Gnàthaichte" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Roghainnean gnàthachaidh" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Co-dhùin cò aig a bheil cead eadar-ghabhail a dhèanamh leis a’ phost seo." +msgstr "Roghainnean gnàthachaidh<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Cuir air gleus àrainneachd Bhluesky dhut fhèin" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Dorcha" @@ -2835,17 +2653,13 @@ msgstr "Leòsan an dì-bhugachaidh" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Bun-roghainn" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Na h-ìomhaigheagan bunaiteach" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Cuir dearbhadh 2FA air a’ phost-d à comas" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Cuir an fhreagairt haptaigeach à comas" +msgstr "Cuir an fhreagairt haptaigeach à comas<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Fidir inbhirean ùra" msgid "Dismiss" msgstr "Leig seachad" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Leig seachad a’ mhearachd" @@ -3212,11 +3014,8 @@ msgstr "Na gabh dragh! Chaidh gach teachdaireachd is roghainn a shàbhaladh is b #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Luchdaich a-nuas Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Luchdaich a-nuas am faidhle CAR" +msgstr "Luchdaich a-nuas am faidhle CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Deasaich" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Deasaich an t-avatar" @@ -3627,7 +3423,7 @@ msgstr "Fosglaidh seo an làn-sgrìn" msgid "Entertainment" msgstr "Dibhearsan" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Mearachd" @@ -3648,11 +3444,11 @@ msgstr "Teachdaireachd na mearachd" msgid "Error occurred while saving file" msgstr "Dh’èirich mearachd nuair a bha sinn a’ sàbhaladh an fhaidhle" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Dh’èirich mearachd nuair a bha sinn a’ faighinn freagairt a’ Chaptcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Mearachd: {error}" @@ -3674,19 +3470,8 @@ msgstr "on a h-uile duine" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "A h-uile rud eile" +msgstr "A h-uile rud eile<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Cus iomraidhean no fhreagairtean" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Cus theachdaireachdan no feadhainn gun iarraidh" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Dùin às luchd-cleachdaidh a tha thu gan leantainn" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Inbhir" @@ -4165,26 +3946,8 @@ msgstr "Crìochnaich" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" +msgstr "Fitness<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Dubh gun chaisead" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Gorm gun chaisead" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Geal gun chaisead" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Sùbailte" @@ -4195,16 +3958,7 @@ msgstr "Sùbailte" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Lean" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Lean" @@ -4247,16 +4001,8 @@ msgstr "Lean a h-uile cunntas" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Lean iad cuideachd" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Lean iad cuideachd" @@ -4296,13 +4042,9 @@ msgstr "Luchd-leantainn as aithne dhut" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Ga leantainn" @@ -4310,16 +4052,11 @@ msgstr "Ga leantainn" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Ga leantainn" +msgstr "Ga leantainn<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "A’ leantainn {0} a-nis" @@ -4406,15 +4143,8 @@ msgstr "Na dhìochuimhnich thu e?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Saor an t-inbhir agad" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "A’ postadh susbaint gun iarraidh gu tric" +msgstr "Saor an t-inbhir agad<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "O" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Cuir aodann ris a’ phròifil agad" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Briseadh mòr an lagha no teirmichean na seirbheise" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Cuir aodann ris a’ phròifil agad<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Haptaigeachd" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Sàrachadh, trolladh no neo-fhulangas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "A bheil còd agad? <0>Briog an-seo." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "A bheil duilgheadasan agad?" +msgstr "A bheil duilgheadasan agad?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Falaich gach roghainn gnàthachaidh" +msgstr "Falaich gach roghainn gnàthachaidh<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Falaich am post seo uam-sa" @@ -4985,17 +4677,9 @@ msgstr "Mas e neach-leasachaidh a th’ annad, is urrainn dhut frithealaiche a c #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Ma tha thu airson an làmhrachan no post-d agad atharrachadh, dèan sin mus tèid e à comas." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Mì-laghail is èiginneach" +msgstr "Ma tha thu airson an làmhrachan no post-d agad atharrachadh, dèan sin mus tèid e à comas.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Dealbh" @@ -5015,29 +4699,15 @@ msgstr "Chaidh an dealbh a shàbhaladh" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Chan urrainn dhut dealbhan a shàbhaladh ach ma thug thu cead-inntrigidh dhuinn do leabhar-lann nan dealbhan agad." +msgstr "Chan urrainn dhut dealbhan a shàbhaladh ach ma thug thu cead-inntrigidh dhuinn do leabhar-lann nan dealbhan agad.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Breug-riochdachadh no breugan mun dearbh-aithne no dlùth-chompanas aca" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Breug-riochdachadh, fiosrachadh-brèige no tagraidhean-brèige" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "San aplacaid; push, a h-uile duine" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "San aplacaid; push, daoine a tha thu gan leantainn" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Teachdaireachdan mì-iomchaidh no ceanglaichean feòlmhor" +msgstr "San aplacaid; push, daoine a tha thu gan leantainn<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Cuir a-steach am facal-faire airson an cunntas a sguabadh às" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Cuir a-steach an còd a chuir sinn thugad air a’ phost-d" +msgstr "Cuir a-steach an còd a chuir sinn thugad air a’ phost-d<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Eadar-ghabhail chuingichte" @@ -5189,7 +4844,7 @@ msgstr "Chan eil ann ach <0>{0} aig an ìre-sa! Cuir barrachd dhaoine ris a msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Chan eil ann ach thu fhèin an-dràsta fhèin! Cuir barrachd dhaoine ris a’ phacaid tòiseachaidh agad le bhith a’ dèanamh lorg gu h-àrd." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID na h-obrach: {0}" @@ -5232,17 +4887,13 @@ msgstr "Air a leubaileadh le {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Air a leubaileadh leis an ùghdar." +msgstr "Air a leubaileadh leis an ùghdar.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Leubailean" @@ -5307,17 +4958,9 @@ msgstr "Barrachd fiosrachaidh" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Barrachd fiosrachadh mu dhearbhadh na h-aoise" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Barrachd fiosrachaidh mu dhèidhinn Bluesky" +msgstr "Barrachd fiosrachadh mu dhearbhadh na h-aoise<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Barrachd fiosrachaidh mu fhèin-òstaireachd a’ PDS agad." @@ -5352,15 +4995,10 @@ msgstr "Barrachd fiosrachaidh mu na rudan a tha poblach air Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Faigh barrachd fiosrachaidh ann an <0>roghainnean a’ chunntais agad." +msgstr "Faigh barrachd fiosrachaidh ann an <0>roghainnean a’ chunntais agad.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Barrachd fiosrachaidh." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "’S toil" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "’S toil ({0, plural, one {’s toil le # seo} two {’s toil le # seo} few {’s toil le # seo} other {’s toil le # seo}})" @@ -5491,13 +5125,9 @@ msgstr "’S toil le cuideigin rud a dh’ath-phostaich thu" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Brathan mu dhaoine a dh’innis gur toil leotha rud a dh’ath-phostaich thu" +msgstr "Brathan mu dhaoine a dh’innis gur toil leotha rud a dh’ath-phostaich thu<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Daoine as toil leotha am post seo" @@ -5801,45 +5431,23 @@ msgstr "Roghainnean na teachdaireachd" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Teachdaireachdan" +msgstr "Teachdaireachdan<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Meadhan-oidhche" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Brathan eile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cunntas meallta" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Post meallta" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Innealan modarataireachd" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Thagh modaratair rabhadh coitcheann dhan t-susbaint." +msgstr "Thagh modaratair rabhadh coitcheann dhan t-susbaint.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Barrachd inbhirean" @@ -6049,18 +5652,8 @@ msgstr "Na h-inbhirean agam" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ainm" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Tha an t-ainm no tuairisgeul a’ briseadh stannardan na coimhearsnachd" - -======= ->>>>>>> upstream/main +msgstr "Ainm<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "Gun dealbh" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Cha toil le gin seo fhathast" +msgstr "Cha toil le gin seo fhathast<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Chan eil thu a’ leantainn {0} tuilleadh" @@ -6285,7 +5873,7 @@ msgstr "Gun teachdaireachdan fhathast" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Cuir cùl ris an sgrios-sgroladh a sparras algairimean ort. Faigh lorg air inbhirean a bheir dhut na tha a dhìth ort seach sgudal a sparradh ort." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Chan eil brath sam bith ann fhathast!" @@ -6339,9 +5927,9 @@ msgstr "Cha deach toradh a lorg" msgid "No results found for \"{query}\"" msgstr "Cha deach toradh a lorg airson “{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Cha deach toradh a lorg airson “{query}”" @@ -6476,15 +6064,8 @@ msgstr "An-dràsta" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Lomnochd" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Lomnochd no susbaint inbheach ach gun leubail d’ a rèir" +msgstr "Lomnochd<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "Ceart ma-thà" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Ceart ma-thà" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Fosgail an clàr-taice air an taobh" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Fosgail ròghnaichear nan emoji" @@ -6710,7 +6287,7 @@ msgstr "Fosglaidh seo an gleus-sgrìobhaidh" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Fosglaidh seo gailearaidh an uidheim airson suas ri {MAX_IMAGES, plural, one {# dealbh} two {# dhealbh} few {# dealbhan}other {# dealbh}} no aon video no GIF a thaghadh." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Fosglaidh seo ròghnaichear nan emoji" @@ -6750,15 +6327,10 @@ msgstr "Fosglaidh seo foirm ath-shuidheachadh an fhacail-fhaire" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Fosglaidh seo roghainnean cànan a’ phuist" +msgstr "Fosglaidh seo roghainnean cànan a’ phuist<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Fosglaidh seo a’ phròifil" @@ -6792,12 +6364,7 @@ msgstr "Staid OTA: Chan eil gin ri fhaighinn" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Rud eile" @@ -6907,23 +6474,16 @@ msgstr "Daoine a leanas ri @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Daoine a tha mi gan leantainn" +msgstr "Daoine a tha mi gan leantainn<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Chaidh cead-inntrigidh do leabhar-lann nan dealbhan agad a dhiùltadh. Cuir an comas e ann an roghainnean an t-siostaim agad." @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postaich" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Postaich" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Postaich na h-uile" @@ -7208,19 +6768,12 @@ msgstr "Chaidh am post a sguabadh às" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Dh’fhàillig luchdadh suas a’ phuist. Thoir sùil air a’ cheangal ris an eadar-lìon agad is feuch ris a-rithist." +msgstr "Dh’fhàillig luchdadh suas a’ phuist. Thoir sùil air a’ cheangal ris an eadar-lìon agad is feuch ris a-rithist.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Chaidh am post a sguabadh às" @@ -7356,7 +6909,7 @@ msgstr "Am poileasaidh prìobhaideachd" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "A’ pròiseasadh a’ video…" @@ -7384,19 +6937,12 @@ msgstr "Chaidh a’ phròifil ùrachadh" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Poblach" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Poblach, liostaichean as urrainn dhut co-roinneadh airson inbhirean a ruith." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Foillsich am post" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Foillsich na puist" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Foillsich na freagairtean" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Foillsich an fhreagairt" @@ -7488,13 +7034,9 @@ msgstr "Tha luaidhean air puist à comas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Luaidhean" +msgstr "Luaidhean<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Luaidhean air a’ phost seo" @@ -7555,12 +7097,12 @@ msgstr "Leugh teirmichean na seirbheise aig Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Thoir an ceanglachan air falbh" msgid "Remove Avatar" msgstr "Thoir an t-avatar air falbh" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Thoir a’ bhratach air falbh" @@ -7826,17 +7368,13 @@ msgstr "Tha na freagairtean à comas" msgid "Replies to this post are disabled." msgstr "Chan urrainnear am post seo a fhreagairt." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Freagair" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Freagair ({0, plural, one {# fhreagairt} two {# fhreagairt} few {# freagairtean} other {# freagairt}})" @@ -7997,13 +7535,9 @@ msgstr "Rinn thu ath-phostadh" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Ath-phostadh" +msgstr "Ath-phostadh<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Ath-phostaidh a’ phuist seo" @@ -8076,17 +7610,13 @@ msgstr "Ath-shuidhich staid a’ bhòrdachaidh" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Ath-shuidhich am facal-faire" +msgstr "Ath-shuidhich am facal-faire<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Feuchaidh seo ri clàradh a-steach a-rithist" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Saidheans" +msgstr "Saidheans<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Sgrolaich chun an taoibh chlì" @@ -8301,11 +7828,11 @@ msgstr "Lorg “{interestsDisplayName}”" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Lorg “{interestsDisplayName}” (gnìomhach)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Toraidhean airson “{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Lorg “{searchText}”" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Lorg GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Chan urrainn dhut lorg a dhèanamh ’s tu gun chlàradh a-steach aig an àm seo" @@ -8630,19 +8157,12 @@ msgstr "Suidhich latha do bhreith" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Suidhich facal-faire ùr" +msgstr "Suidhich facal-faire ùr<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Suidhich an cunntas agad" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Seall na freagairtean" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Seall na freagairtean mar" +msgstr "Seall na freagairtean mar<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Seall an fhreagairt dhan a h-uile duine" @@ -8912,13 +8423,9 @@ msgstr "Seall rabhadh" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Seall rabhadh is criathraich às na h-inbhirean e" +msgstr "Seall rabhadh is criathraich às na h-inbhirean e<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Innsidh seo cuin a chaidh am post seo a chruthachadh" @@ -8939,7 +8446,7 @@ msgstr "Seallaidh seo an t-susbaint" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "An tùs: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spama" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spama; cus iomraidhean no fhreagairtean" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Molaidhean dhut" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Leth-fheiseil" +msgstr "Leth-fheiseil<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Èirigh na grèine" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Laighe na grèine" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Na teirmichean" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Teirmichean na seirbheise" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Tha briathran ann a bhriseas stannardan na coimhearsnachd" - -======= ->>>>>>> upstream/main +msgstr "Teirmichean na seirbheise<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Teacsa ⁊ tagaichean" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Sin e!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "’S urrainn dhan chunntas seo eadar-ghabhail a dhèanamh leat a-rithist an dèidh dhut a dhì-bhacadh." @@ -9648,17 +9115,12 @@ msgstr "Cha b’ urrainn dhuinn conaltradh leis an fhrithealaiche" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Cha b’ urrainn dhuinn conaltradh leis an fhrithealaiche, thoir sùil air a’ cheangal ris an eadar-lìon is feuch ris a-rithist." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Cha b’ urrainn dhuinn na brathan fhaighinn dhut. Thoir gnogag airson feuchainn ris a-rithist." +msgstr "Cha b’ urrainn dhuinn na brathan fhaighinn dhut. Thoir gnogag airson feuchainn ris a-rithist.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Cha b’ urrainn dhuinn na puist fhaighinn dhut. Thoir gnogag airson feuchainn ris a-rithist." @@ -9697,16 +9159,9 @@ msgstr "Cha b’ urrainn dhuinn na h-inbhirean agad ùrachadh, thoir sùil air a #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Dh’èirich duilgheadas ris nach robh dùil san aplacaid. Innis dhuinn #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Tha sluagh mòr air ùr-thighinn dha Bluesky! Cuiridh sinn an cunntas agad an gnìomh cho luath ’s a ghabhas." +msgstr "Tha sluagh mòr air ùr-thighinn dha Bluesky! Cuiridh sinn an cunntas agad an gnìomh cho luath ’s a ghabhas.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Tha an liosta seo falamh." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Chan eil an t-seirbheis modarataireachd seo ri làimh. Chì thu barrachd fiosrachaidh mu dhèidhinn gu h-ìosal. Ma mhaireas an duilgheadas seo, cuir fios thugainn." +msgstr "Chan eil an t-seirbheis modarataireachd seo ri làimh. Chì thu barrachd fiosrachaidh mu dhèidhinn gu h-ìosal. Ma mhaireas an duilgheadas seo, cuir fios thugainn.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Tha am post seo a’ cumail a-mach gun deach a chruthachadh <0>{0} ach chunnacas e air Bluesky <1>{1} an toiseach." @@ -10073,17 +9519,10 @@ msgstr "Cuspair" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Eadar-theangaich" @@ -10205,22 +9644,13 @@ msgstr "Dì-bhac" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Dì-bhac an cunntas" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "A bheil thu airson an cunntas a dhì-bhacadh?" @@ -10242,16 +9672,8 @@ msgstr "Neo-dhèan an t-ath-phostadh" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Neo-dhèan an t-ath-phostadh ({0, plural, one {air ath-phostadh # turas} two {air ath-phostadh # thuras} few {air ath-phostadh # turais} other {air ath-phostadh # turas}})" +msgstr "Neo-dhèan an t-ath-phostadh ({0, plural, one {air ath-phostadh # turas} two {air ath-phostadh # thuras} few {air ath-phostadh # turais} other {air ath-phostadh # turas}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Na lean tuilleadh" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Na lean ri {0} tuilleadh" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Cha toil tuilleadh" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Cha toil tuilleadh ({0, plural, one {’s toil le # seo} two {’s toil le # seo} few {’s toil le # seo} other {’s toil le # seo}})" @@ -10409,16 +9823,8 @@ msgstr "Chaidh crìoch a chur air an fho-sgrìobhadh aig an liosta" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Chan eil taic ri videothan dhen t-seòrsa {mimeType}" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Susbaint fheiseil gun iarraidh" +msgstr "Chan eil taic ri videothan dhen t-seòrsa {mimeType}<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Luchdaich suas faidhle teacsa gu:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Luchdaich suas on chamara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Luchdaich suas o na faidhlichean" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Luchdaich suas on leabhar-lann" @@ -10494,7 +9900,7 @@ msgstr "A’ luchdadh suas nan dealbhan…" msgid "Uploading link thumbnail..." msgstr "A’ luchdadh suas dealbhag a’ cheangail…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "A’ luchdadh suas a’ video…" @@ -10748,7 +10154,7 @@ msgstr "Cha deach a’ video a lorg." msgid "Video settings" msgstr "Roghainnean a’ video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Chaidh a’ video a luchdadh suas" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Seall an t-avatar aig {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Seall am bloga airson barrachd fiosrachaidh" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Seall an t-innteart dì-bhugachaidh" +msgstr "Seall an t-innteart dì-bhugachaidh<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Seall am mion-fhiosrachadh" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Seall a’ phròifil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Seall an t-avatar" @@ -10890,15 +10291,10 @@ msgstr "Seall na cunntasan a mhùch thu" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Seall an dearbhadh a rinn thu" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Seall an dearbhadh a rinn thu<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Seallaidh seo an dealbh slàn" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Tha sinn duilich ach chan urrainn dhuinn an liosta seo fhuasgladh. Ma mh msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Tha sinn duilich ach cha b’ urrainn dhuinn na faclan a mhùch thu a luchdadh an-dràsta fhèin. Feuch ris a-rithist." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Tha sinn duilich ach cha b’ urrainn dhuinn sin a lorg dhut. Feuch ris a-rithist ann am beagan mhionaidean." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Carson bu chòir dhuinn lèirmheas a dhèanamh air an chleachdaiche seo?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/gl/messages.po b/src/locale/locales/gl/messages.po index 8f5bc741f..75ead2095 100644 --- a/src/locale/locales/gl/messages.po +++ b/src/locale/locales/gl/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seguindo} other {seguindo}}" +msgstr "{0, plural, one {seguindo} other {seguindo}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {gustoulle} other {gustoulles}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {cita} other {citas}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {cita} other {citas}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} ás {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Accesibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Axustes de accesibilidade" +msgstr "Axustes de accesibilidade<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta" +msgstr "Conta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Conta bloqueada" @@ -661,26 +634,18 @@ msgstr "Conta silenciada por listaxe" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcións da conta" +msgstr "Opcións da conta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Conta elimada de acceso rápido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Conta desbloqueada" @@ -770,7 +735,7 @@ msgstr "" msgid "Add another post" msgstr "" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contido para adultos" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema non presente nestas opcións" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamento antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Contrasinais da app" @@ -1283,19 +1225,12 @@ msgstr "Apelar suspensión" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apelar esta decisión" +msgstr "Apelar esta decisión<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aparencia" @@ -1307,23 +1242,14 @@ msgstr "Aplicar canles recomendadas predeterminados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arquivada dende {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arquivada dende {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publicación arquivada" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversario" +msgstr "Aniversario<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquear conta" @@ -1546,15 +1446,8 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e eliminar" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloquear e/ou eliminar esta conversa" +msgstr "Bloquear e eliminar<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloquear listaxe" @@ -1574,18 +1467,14 @@ msgstr "Bloquear conta" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear Conta" +msgstr "Bloquear Conta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloqueado" @@ -1617,40 +1506,18 @@ msgstr "O bloqueo é público. Se bloqueas unha conta non poderá responder os t #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Se bloqueas a un etiquetador aínda poderá seguir aplicando etiquetas na túa conta, mais evitará que responda nos teus fíos, que te mencione e non poderá interactuar contigo de ningunha maneira." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky non pode confirmar a autenticidade da data solicitada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Se bloqueas a un etiquetador aínda poderá seguir aplicando etiquetas na túa conta, mais evitará que responda nos teus fíos, que te mencione e non poderá interactuar contigo de ningunha maneira.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky non pode confirmar a autenticidade da data solicitada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky é unha rede aberta onde podes elixir o teu proveedor de aloxamento. Se es desenvolves, podes aloxar o teu propio servidor." @@ -1702,13 +1569,9 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Explorar máis contas" @@ -1819,19 +1682,13 @@ msgstr "Cámara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "Cancelar a reactivación e pechar a sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar procura" +msgstr "Cancelar procura<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Non se pode interactuar cunha conta bloqueada" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Pecha a alerta de actualización de contrasinal" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Redactar resposta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimindo vídeo..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código" +msgstr "Copiar código<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "" @@ -2705,7 +2538,7 @@ msgstr "Crear unha conta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crea unha conta" @@ -2766,15 +2599,8 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personaliza quen pode interactuar con este chío." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Escuro" @@ -2834,17 +2653,13 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Por Defecto" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Desactivar Correo 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactivar a retroalimentación háptica" +msgstr "Desactivar a retroalimentación háptica<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Descobre Novas Canles" msgid "Dismiss" msgstr "Desbotar" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Desbotar erro" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Descargar Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Descargar ficheiro CAR" +msgstr "Descargar ficheiro CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar avatar" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Erro" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Ocorreu un erro ao gardar o ficheiro" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error ao recibir a resposta do captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mencións ou respostas excesivas" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensaxes excesivos ou non desexados" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluír á contas que segues" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Canles" @@ -4164,26 +3946,8 @@ msgstr "Rematar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexíbel" @@ -4194,16 +3958,7 @@ msgstr "Flexíbel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seguir" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seguir tamén" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seguir tamén" @@ -4295,13 +4042,9 @@ msgstr "Seguidores que coñeces" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seguindo" @@ -4309,16 +4052,11 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo" +msgstr "Seguindo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Seguindo {0}" @@ -4405,15 +4143,8 @@ msgstr "Esquecéchelo?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publicacións frecuentes de contido non desexado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dálle ao teu perfil unha cara bonita" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violacións flagrantes da Lei ou dos Termos de servizo" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Dálle ao teu perfil unha cara bonita<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Acoso, trolling ou intolerancia" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tes problemas?" +msgstr "Tes problemas?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ocultar o chío para min" @@ -4984,17 +4677,9 @@ msgstr "Se es desenvolvedor, podes hospedar o teu propio servidor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Se estás intentando cambiar o teu alcume ou enderezo electrónico, faino antes de desactivar a túa conta." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal e Urxente" +msgstr "Se estás intentando cambiar o teu alcume ou enderezo electrónico, faino antes de desactivar a túa conta.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imaxe" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Suplantación de identidade ou afirmacións falsas sobre identidade ou afiliación" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Suplantación de identidade, desinformación ou afirmacións falsas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mensaxes inapropiadas ou ligazóns explícitas" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Introduce o contrasinal para eliminar a conta" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Introduce o código que se che enviou por correo electrónico" +msgstr "Introduce o código que se che enviou por correo electrónico<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interacción limitada" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Por agora só estás ti! Engade máis persoas ao teu paquete inicial buscando arriba." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Tarefa ID: {0}" @@ -5231,17 +4887,13 @@ msgstr "Etiquetado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetado pola persoa autora." +msgstr "Etiquetado pola persoa autora.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquetas" @@ -5306,17 +4958,9 @@ msgstr "Aprender máis" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Aprender máis de Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Obtén máis información sobre como aloxar o teu PDS." @@ -5351,15 +4995,10 @@ msgstr "Máis información sobre o que é público en Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Aprender máis." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Gústame en este chío" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaxes" +msgstr "Mensaxes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Conta enganosa" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Chío enganoso" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Ferramentas de moderación" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "A persoas moderadora decidiu establecer unha advertencia xeral sobre o contido. " +msgstr "A persoas moderadora decidiu establecer unha advertencia xeral sobre o contido. <<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Máis canles" @@ -6047,18 +5652,8 @@ msgstr "As miñas canles" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "O nome ou a descrición está a violar as normas da comunidade " - -======= ->>>>>>> upstream/main +msgstr "Nome<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Aínda sen gústames" +msgstr "Aínda sen gústames<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Xa non segues a {0}" @@ -6283,7 +5873,7 @@ msgstr "Aínda non hai mensaxes" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Aínda non hai notificacións!" @@ -6337,9 +5927,9 @@ msgstr "Non se encontraron resultados" msgid "No results found for \"{query}\"" msgstr "Non se encontraron resultados para \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Non se encontraron resultados para {query}" @@ -6474,15 +6064,8 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Desnudez ou contido para persoas adultas non etiquetado como tal" +msgstr "Nudez<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "Ben" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Está ben" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Abrir menú lateral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Abrir o selector de emoji" @@ -6708,7 +6287,7 @@ msgstr "Abrir compositor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Abre o selector de emojis" @@ -6748,15 +6327,10 @@ msgstr "Abrir o formulario de restablecemento do contrasinal" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Abrir este perfil" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Outro" @@ -6905,23 +6474,16 @@ msgstr "Persoas siguindo a @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Chiar" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Chiar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar todo" @@ -7206,19 +6768,12 @@ msgstr "Chío eliminado" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Produciuse un erro ao cargar o chío. Comproba a túa conexión a Internet e téntao de novo." +msgstr "Produciuse un erro ao cargar o chío. Comproba a túa conexión a Internet e téntao de novo.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "A publicación foi eliminada" @@ -7354,7 +6909,7 @@ msgstr "Política de privacidade" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Procesando vídeo..." @@ -7382,19 +6937,12 @@ msgstr "Perfil actualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Público" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas" +msgstr "Citas<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citas deste chío" @@ -7553,12 +7097,12 @@ msgstr "Le as Condicións de servizo de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Eliminar anexo" msgid "Remove Avatar" msgstr "Eliminar Avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Eliminar Banner" @@ -7824,17 +7368,13 @@ msgstr "Respostas deshabilitadas" msgid "Replies to this post are disabled." msgstr "As respostas a este chío están desactivadas." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "Rechouchiado por ti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Rechouchíos deste chío" @@ -8074,17 +7610,13 @@ msgstr "Restablecer o estado de incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablecer o contrasinal" +msgstr "Restablecer o contrasinal<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia" +msgstr "Ciencia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Buscar \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Buscar \"{searchText}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Buscar GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Establecer aniversario" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establecer un novo contrasinal" +msgstr "Establecer un novo contrasinal<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configura a túa conta" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Amosar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amosar respostas como" +msgstr "Amosar respostas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostrar resposta para todo o mundo" @@ -8910,13 +8423,9 @@ msgstr "Mostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar advertencia e filtrar desde as canles" +msgstr "Mostrar advertencia e filtrar desde as canles<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Amosa información sobre cando foi creada esta publicación" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Lixo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; mencións ou respostas excesivas" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Suxerido para ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suxestivo" +msgstr "Suxestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Condicións" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Condicións de servizo" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Os termos utilizados infrinxen os estándares da comunidade" - -======= ->>>>>>> upstream/main +msgstr "Condicións de servizo<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto e etiquetas" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "Iso é todo!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "A conta poderá interactuar contigo despois de desbloqueala." @@ -9646,17 +9115,12 @@ msgstr "Produciuse un problema ao contactar co servidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Houbo un problema ao contactar co servidor. Comproba a túa conexión a Internet e téntao de novo." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Houbo un problema ao recuperar as notificacións. Toca aquí para tentalo de novo." +msgstr "Houbo un problema ao recuperar as notificacións. Toca aquí para tentalo de novo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Houbo un problema ao recuperar os chíos. Toca aquí para tentalo de novo." @@ -9695,16 +9159,9 @@ msgstr "Houbo un problema ao actualizar as túas canles. Comproba a túa conexi #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "Houbo un problema inesperado na aplicación. Avísanos se che pasou isto #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Houbo un alude de novas persoas a Bluesky! Activaremos a túa conta en canto poidamos." +msgstr "Houbo un alude de novas persoas a Bluesky! Activaremos a túa conta en canto poidamos.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Esta lista está baleira." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Este servizo de moderación non está disponíbel. Consulta máis detalles a continuación. Se o problema persiste, contáctanos." +msgstr "Este servizo de moderación non está disponíbel. Consulta máis detalles a continuación. Se o problema persiste, contáctanos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Esta publicación declara que foi feita en <0>{0}, pero foi vista por primeira vez por Bluesky en <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Tema" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducir" @@ -10203,22 +9644,13 @@ msgstr "Desbloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloquear conta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Desbloquear Conta?" @@ -10240,16 +9672,8 @@ msgstr "Desfacer o rechouchío" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Deixar de seguir" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Deixa de seguir a {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "No me gusta" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "Cancelouse a subscrición da listaxe" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contido sexual non desexado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Carga un ficheiro de texto a:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Cargar desde a cámara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Cargar desde ficheiros" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Cargar desde a biblioteca" @@ -10492,7 +9900,7 @@ msgstr "Cargando imaxes..." msgid "Uploading link thumbnail..." msgstr "Cargando miniatura da ligazón..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Cargando vídeo..." @@ -10746,7 +10154,7 @@ msgstr "Non se encontrou o vídeo." msgid "Video settings" msgstr "Axustes do video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Vídeo cargado" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ver o avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Consulta a publicación do blog para obter máis detalles" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver a entrada de depuración" +msgstr "Ver a entrada de depuración<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ver detalles" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Ver perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Ver o avatar" @@ -10888,15 +10291,10 @@ msgstr "Consulta as túas contas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Sentímolo, mais non puidemos resolver esta lista. Se isto persiste, pó msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Sentímolo, mais non puidemos cargar as túas palabras silenciadas neste momento. Téntao de novo." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Sentímolo, mais a túa busca non se puido completar. Téntao de novo nuns minutos." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Por que se debería revisar esta persoa?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/hi/messages.po b/src/locale/locales/hi/messages.po index 6ad72440d..c140f368d 100644 --- a/src/locale/locales/hi/messages.po +++ b/src/locale/locales/hi/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {फ़ॉलोअर} other {फ़ॉलोअर}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {फ़ॉलोइंग} other {फ़ॉलोइंग}}" +msgstr "{0, plural, one {फ़ॉलोइंग} other {फ़ॉलोइंग}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {पसंद}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {पोस्ट}}" +msgstr "{0, plural, other {पोस्ट}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {क्वोट}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {रीपोस्ट}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {क्वोट}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {रीपोस्ट}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} को {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "सुलभता" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "सुलभता के सेटिंग" +msgstr "सुलभता के सेटिंग<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "खाता" +msgstr "खाता<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "खाता अवरुद्ध" @@ -661,26 +634,18 @@ msgstr "सूची द्वारा खाता म्यूट किय #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "खाते के विकल्प" +msgstr "खाते के विकल्प<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "जल्द पहुँच से खाता हटाया गया" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "खाता अनअवरुद्ध" @@ -770,7 +735,7 @@ msgstr "एक और खाता जोड़ें" msgid "Add another post" msgstr "एक और पोस्ट जोड़ें" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "वयस्क सामग्री" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "समस्या जो इन विकल्पों में से नहीं है" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "असामाजिक व्यवहार" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "ऐप पासवर्ड नाम में कम से कम 4 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "ऐप पासवर्ड" +msgstr "ऐप पासवर्ड<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "ऐप पासवर्ड" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "इस निर्णय पर अपील करें" +msgstr "इस निर्णय पर अपील करें<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "दिखावट" @@ -1307,23 +1242,14 @@ msgstr "डिफ़ॉल्‍ट अनुशंसित फ़ीड लगा #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0} से पुरालेखित" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0} से पुरालेखित" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "पुरालेखित पोस्ट" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "जन्मदिन" +msgstr "जन्मदिन<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "अवरुद्ध करें" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "खाता अवरुद्ध करें" @@ -1546,15 +1446,8 @@ msgstr "खाता अवरुद्ध करें" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "अवरोध की सूची" @@ -1574,18 +1467,14 @@ msgstr "उपयोगकर्ता को अवरुद्ध करें #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "उपयोगकर्ता को अवरुद्ध करें" +msgstr "उपयोगकर्ता को अवरुद्ध करें<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "अवरुद्ध" @@ -1617,40 +1506,18 @@ msgstr "अवरोधन सार्वजनिक है. अवरुद #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "अवरुद्ध करने पर भी आपके खाते पर लेबल लग सकता है, पर इससे यह खाता आपके थ्रेड में जवाब नहीं दे सकेगा या आपसे संपर्क नहीं कर सकेगा।" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky दावा किए गए तिथि के प्रामाणिकता की पुष्टि नहीं कर सकता।" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "ब्लॉग" +msgstr "अवरुद्ध करने पर भी आपके खाते पर लेबल लग सकता है, पर इससे यह खाता आपके थ्रेड में जवाब नहीं दे सकेगा या आपसे संपर्क नहीं कर सकेगा।<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky दावा किए गए तिथि के प्रामाणिकता की पुष्टि नहीं कर सकता।" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky एक खुला नेटवर्क है जहाँ आप अपना होस्टिंग प्रदाता चुन सकते हैं। यदि आप डेवलपर हैं, आप अपना सर्वर होस्ट कर सकते हैं।" @@ -1702,13 +1569,9 @@ msgstr "किताबें" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "एक्सप्लोर पृष्ठ पर और खाते देखें" @@ -1819,19 +1682,13 @@ msgstr "कैमरा" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "खोज रद्द करें" +msgstr "खोज रद्द करें<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "अवरुद्ध उपयोगकर्ता से संपर्क नहीं कर सकते" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "ठक 🐴 ठक 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "पासवर्ड अपडेट सूचना बंद करता है" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "जवाब लिखें" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "वीडियो कंप्रेस हो रहा है..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "कोड कॉपी करें" +msgstr "कोड कॉपी करें<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID कॉपी करें" @@ -2705,7 +2538,7 @@ msgstr "खाता बनाएँ" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "खाता बनाएँ" @@ -2766,15 +2599,8 @@ msgstr "कस्टम" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "चुनें कि इस पोस्ट से कौन संपर्क कर सकता है।" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "अँधेरा" @@ -2834,17 +2653,13 @@ msgstr "पैनल डिबग करें" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "डिफ़ॉल्‍ट" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "डिफ़ॉल्‍ट आइकॉन" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "ईमेल 2FA अक्षम करें" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "कंपन फीडबैक अक्षम करें" +msgstr "कंपन फीडबैक अक्षम करें<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "नए फ़ीड की खोज करें" msgid "Dismiss" msgstr "ख़ारिज करें" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "त्रुटि ख़ारिज करें" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Bluesky डाउनलोड करें" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR फ़ाइल डाउनलोड करें " +msgstr "CAR फ़ाइल डाउनलोड करें <<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "संपादित करें" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "अवतार संपादित करें" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "त्रुटि" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "फ़ाइल सहेजते समय त्रुटि हुई" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "CAPTCHA उत्तर पाने मे त्रुटि हुई" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "सब" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "अत्यधिक उल्लेख या जवाब" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "अत्यधिक या अनचाहे संदेश" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "आपके फ़ॉलो किए गए उपयोगकर्ताओं के अलावा" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "फ़ीड" @@ -4164,26 +3946,8 @@ msgstr "समाप्त करें" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "स्वास्थ्य" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "स्वास्थ्य<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "लचीला" @@ -4194,16 +3958,7 @@ msgstr "लचीला" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "फ़ॉलो करें" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "फ़ॉलो करें" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "वापस फ़ॉलो करें" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "वापस फ़ॉलो करें" @@ -4295,13 +4042,9 @@ msgstr "फ़ॉलोअर जिन्हें आप जानते ह #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "फ़ॉलोइंग" @@ -4309,16 +4052,11 @@ msgstr "फ़ॉलोइंग" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "फ़ॉलोइंग" +msgstr "फ़ॉलोइंग<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0} को फ़ॉलो करते हैं" @@ -4405,15 +4143,8 @@ msgstr "भूल गए?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "लगातार अनचाही सामग्री पोस्ट करते हैं" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "अपने प्रोफ़ाइल को एक चेहरा दें" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "क़ानून या सेवा की शर्तों का स्पष्ट उल्लंघन" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "अपने प्रोफ़ाइल को एक चेहरा दें<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "कंपन" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "उत्पीड़न, ट्रोलिंग, या असहिष्णुता" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "मुश्किल हो रही है?" +msgstr "मुश्किल हो रही है?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "मेरे लिए पोस्ट छिपाएँ" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "यदि आप अपना हैंडल या ईमेल बदलने का प्रयास कर रहे हैं, ऐसा निष्क्रिय करने से पहले करें।" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "ग़ैरक़ानूनी और अत्यावश्यक" +msgstr "यदि आप अपना हैंडल या ईमेल बदलने का प्रयास कर रहे हैं, ऐसा निष्क्रिय करने से पहले करें।<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "छवि" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "प्रतिरूपण या पहचान या संबंधन के बारे में ग़लत दावे" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "प्रतिरूपण, झूठी जानकारी, या ग़लत दावे" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "अनुचित संदेश या अश्लील लिंक" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "खाता मिटाने किए लिए पासवर् #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "आपको ईमेल की गई कोड दर्ज करें" +msgstr "आपको ईमेल की गई कोड दर्ज करें<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "संपर्क सीमित" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "अभी इसमें बस आप ही हैं! ऊपर खोजकर अपने स्टार्टर पैक में और लोगों को जोड़ें।" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "काम आईडी: {0}" @@ -5231,17 +4887,13 @@ msgstr "{0} द्वारा लेबल किया गया।" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "रचयिता द्वारा लेबल किया गया।" +msgstr "रचयिता द्वारा लेबल किया गया।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "लेबल" @@ -5306,17 +4958,9 @@ msgstr "अधिक जानें" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Bluesky के बारे में अधिक जानें" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "PDS को ख़ुद होस्ट करने के बारे में अधिक जानें।" @@ -5351,15 +4995,10 @@ msgstr "Bluesky पर क्या सार्वजनिक है, इस #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "अधिक जानें।" @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "पसंद" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "पसंद करें ({0, plural, one {# पसंद} other {# पसंद}})" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "इस पोस्ट पर पसंद" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "संदेश" +msgstr "संदेश<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "भ्रमित करने वाला खाता" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "भ्रमित करने वाला पोस्ट" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "मॉडरेशन के औज़ार" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "मॉडरेटर ने सामग्री पर सामान्य चेतावनी दी है।" +msgstr "मॉडरेटर ने सामग्री पर सामान्य चेतावनी दी है।<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "अधिक फ़ीड" @@ -6047,18 +5652,8 @@ msgstr "मेरे फ़ीड" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "नाम" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "नाम या विवरण समुदाय मानकों का उल्लंघन करता है" - -======= ->>>>>>> upstream/main +msgstr "नाम<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "अभी तक कोई पसंद नहीं" +msgstr "अभी तक कोई पसंद नहीं<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} को और फ़ॉलो नहीं कर रहे" @@ -6283,7 +5873,7 @@ msgstr "अभी तक कोई संदेश नहीं" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "अभी तक कोई अधिसूचनाएँ नहीं!" @@ -6337,9 +5927,9 @@ msgstr "कोई परिणाम नहीं मिले" msgid "No results found for \"{query}\"" msgstr "\"{query}\" के लिए कोई परिणाम नहीं मिला" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "{query} के लिए कोई परिणाम नहीं मिला" @@ -6474,15 +6064,8 @@ msgstr "अभी" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "नग्नता" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "नग्नता या वयस्क सामग्री को वैसा लेबल नहीं किया गया" +msgstr "नग्नता<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "ठीक" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "ठीक है" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "ड्रॉअर मेनू खोलें" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "इमोजी चयन खोलें" @@ -6708,7 +6287,7 @@ msgstr "रचयिता खोलता है" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "पासवर्ड रीसेट फ़ॉर्म खोलें" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "यह प्रोफ़ाइल खोलता है" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "अन्य" @@ -6905,23 +6474,16 @@ msgstr "@{0} को फ़ॉलो करते लोग" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "पोस्ट करें" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "पोस्ट करें" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "सभी पोस्ट करें" @@ -7206,19 +6768,12 @@ msgstr "पोस्ट मिटाया गया" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "पोस्ट अपलोड करने में असफल। कृपया अपना इंटरनेट कनेक्शन जाँच लें और फिर प्रयास करें।" +msgstr "पोस्ट अपलोड करने में असफल। कृपया अपना इंटरनेट कनेक्शन जाँच लें और फिर प्रयास करें।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "गोपनीयता नीति" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "वीडियो प्रसंस्करण हो रहा है..." @@ -7382,19 +6937,12 @@ msgstr "प्रोफ़ाइल अपडेट की गई" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "सार्वजनिक" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "सार्वजनिक, साझा योग्य सूचियाँ जो फ़ीड चला सकती हैं।" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "क्वोट पोस्ट अक्षम किए गए" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "क्वोट" +msgstr "क्वोट<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "इस पोस्ट के क्वोट" @@ -7553,12 +7097,12 @@ msgstr "Bluesky सेवा की शर्तें पढ़ें" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "अटैचमेंट हटाएँ" msgid "Remove Avatar" msgstr "अवतार हटाएँ" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "बैनर हटाएँ" @@ -7824,17 +7368,13 @@ msgstr "जवाब अक्षम" msgid "Replies to this post are disabled." msgstr "इस पोस्ट पर जवाब अक्षम है" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "जवाब दें" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "जवाब दें ({0, plural, one {# जवाब} other {# जवाब}})" @@ -7995,13 +7535,9 @@ msgstr "आपने रीपोस्ट किया" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "इस पोस्ट के रीपोस्ट" @@ -8074,17 +7610,13 @@ msgstr "ज्ञानप्राप्ति स्थिति को री #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "पासवर्ड रीसेट करें" +msgstr "पासवर्ड रीसेट करें<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "विज्ञान" +msgstr "विज्ञान<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "\"{query}\" खोजें" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "\"{searchText}\" खोजें" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF खोजें" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "जन्मतिथि चुनें" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "नया पासवर्ड सेट करें" +msgstr "नया पासवर्ड सेट करें<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "खाता बनाएँ" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "जवाब दिखाएँ" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "जवाबों को ऐसे दिखाएँ" +msgstr "जवाबों को ऐसे दिखाएँ<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "जवाब सब के लिए दिखाएँ" @@ -8910,13 +8423,9 @@ msgstr "चेतावनी दिखाएँ" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "चेतावनी दिखाएँ और फ़ीड से फ़िल्टर करें" +msgstr "चेतावनी दिखाएँ और फ़ीड से फ़िल्टर करें<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "स्पैम" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "स्पैम; अत्यधिक उल्लेख या जवाब" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "आपके लिए सुझाव" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "भड़काऊ" +msgstr "भड़काऊ<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "शर्तें" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "सेवा की शर्तें" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "इन शब्दों का उपयोग समुदाय मानकों का उल्लंघन है" - -======= ->>>>>>> upstream/main +msgstr "सेवा की शर्तें<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "पाठ और टैग" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "अनअवरुद्ध करने के बाद खाता आपसे संपर्क कर सकेगा।" @@ -9646,17 +9115,12 @@ msgstr "सर्वर से संपर्क करने में सम msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "सर्वर से संपर्क करने में समस्या हुई, कृपया अपना इंटरनेट कनेक्शन जाँच लें और फिर प्रयास करें।" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "अधिसूचनाएँ लाने में समस्या हुई। फिर प्रयास करने के लिए यहाँ दबाएँ।" +msgstr "अधिसूचनाएँ लाने में समस्या हुई। फिर प्रयास करने के लिए यहाँ दबाएँ।<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "पोस्ट लाने में समस्या हुई। फिर प्रयास करने के लिए यहाँ दबाएँ।" @@ -9695,16 +9159,9 @@ msgstr "आपके फ़ीड को अपडेट करने में स #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "एप्लिकेशन में एक अप्रत्याश #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Bluesky में नए उपयोगकर्ताओं की होड़ लगी है! हम आपका खाता जल्द ही सक्रिय करेंगे।" +msgstr "Bluesky में नए उपयोगकर्ताओं की होड़ लगी है! हम आपका खाता जल्द ही सक्रिय करेंगे।<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "यह सूची खाली है।" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "यह मॉडरेशन सेवा अनुपलब्ध है। अधिक जानकारी के लिए नीचे देखें। यदि यहा समस्या बनी रहती है, हमसे संपर्क करें।" +msgstr "यह मॉडरेशन सेवा अनुपलब्ध है। अधिक जानकारी के लिए नीचे देखें। यदि यहा समस्या बनी रहती है, हमसे संपर्क करें।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "यह पोस्ट <0>{0} को बनने का दावा करता है, पर इसे Bluesky पर सबसे पहले <1>{1} को देखा गया।" @@ -10071,17 +9519,10 @@ msgstr "विषय" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "अनुवाद करें" @@ -10203,22 +9644,13 @@ msgstr "अनअवरुद्ध करें" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "खाता अनअवरुद्ध करें" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "खाता अनअवरुद्ध करें?" @@ -10240,16 +9672,8 @@ msgstr "रीपोस्ट पूर्ववत करें" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "रीपोस्ट पूर्ववत करें ({0, plural, one {# रीपोस्ट} other {# रीपोस्ट}})" +msgstr "रीपोस्ट पूर्ववत करें ({0, plural, one {# रीपोस्ट} other {# रीपोस्ट}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "अनफ़ॉलो करें" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} को अनफ़ॉलो करें" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "नापसंद करें" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "नापसंद करें ({0, plural, one {# पसंद} other {# पसंद}})" @@ -10407,16 +9823,8 @@ msgstr "सूची की सदस्यता छोड़ी गई" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "अनचाहा यौन सामग्री" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "यहाँ पाठ फ़ाइल अपलोड करें:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "कैमरा से अपलोड करें" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "फ़ाइलों से अपलोड करें" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "लाइब्रेरी से अपलोड करें" @@ -10492,7 +9900,7 @@ msgstr "छवि अपलोड हो रहा है..." msgid "Uploading link thumbnail..." msgstr "लिंक थंबनेल अपलोड हो रहा है..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "वीडियो अपलोड हो रहा है..." @@ -10746,7 +10154,7 @@ msgstr "वीडियो नहीं मिला" msgid "Video settings" msgstr "वीडियो सेटिंग" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "वीडियो अपलोड किया गया" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0} का अवतार देखें" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "अधिक जानकारी के लिए ब्लॉग प #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "डीबग प्रविष्टि देखें" +msgstr "डीबग प्रविष्टि देखें<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "विवरण देखें" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "प्रोफ़ाइल देखें" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "अवतार देखें" @@ -10888,15 +10291,10 @@ msgstr "अपने म्यूट किए गए खाते देखे #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "हमें क्षमा करें, पर हम इस सू msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "हमें क्षमा करें, पर हम अभी आपके म्यूट शब्द लोड नहीं कर सके। कृपया फिर प्रयास करें।" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "हमें क्षमा करें, पर आपका खोज पूरा नहीं किया जा सके। कृपया कुछ मिनट बाद फिर प्रयास करें।" @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "इस उपयोगकर्ता की समीक्षा क्यों होनी चाहिए?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/hu/messages.po b/src/locale/locales/hu/messages.po index e926537e1..0dfd1b257 100644 --- a/src/locale/locales/hu/messages.po +++ b/src/locale/locales/hu/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {követő} other {követő}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {követett} other {követett}}" +msgstr "{0, plural, one {követett} other {követett}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {kedvelés} other {kedvelés}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {bejegyzés} other {bejegyzés}}" +msgstr "{0, plural, one {bejegyzés} other {bejegyzés}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {idézés} other {idézés}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {megosztás} other {megosztás}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {idézés} other {idézés}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {megosztás} other {megosztás}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, other {mentés}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# további}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (fiók)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date}, {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Jelentkezz be<1> vagy <2>regisztrálj<3>, <4>ha szeretnél a Blueskyon híreket, sport- és politikai bejegyzéseket, vagy bármi mást keresni!" @@ -587,11 +567,7 @@ msgstr "Névjegy" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Abuzív vagy diszkriminatív viselkedés" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Akadálymentesítés" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Akadálymentesítés" +msgstr "Akadálymentesítés<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Fiók" +msgstr "Fiók<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Fiók letiltva" @@ -669,26 +634,18 @@ msgstr "Elnémított fiók (lista által)" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Fióklehetőségek" +msgstr "Fióklehetőségek<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Fiókszolgáltató" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Fiók levéve a listáról" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Fiók tiltása feloldva" @@ -778,7 +735,7 @@ msgstr "Fiók felvétele a listára" msgid "Add another post" msgstr "Válaszlánc folytatása" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Válaszlánc bővítése" @@ -889,20 +846,12 @@ msgstr "Pornó" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Felnőtt tartalom" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Felnőtt tartalom" @@ -921,11 +870,7 @@ msgstr "Felnőtt tartalmi feljegyzések" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Felnőttek szexuális kizsákmányolása" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "A megbízható hitelesítőket a Bluesky jelöli ki, akik ezután képesek más személyeket hitelesíteni." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Olyan probléma, amit nem lehet a többi kategóriába sorolni" @@ -1171,19 +1112,11 @@ msgstr "és" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Állatok szexuális kizsákmányolása" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Állatkínzás" ->>>>>>> upstream/main +msgstr "Állatkínzás>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Közlemény" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Hitelesítés a Blueskyon" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Antiszociális viselkedés" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Hitelesítés a Blueskyon<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Bárki" ->>>>>>> upstream/main +msgstr "Bárki>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Egy alkalmazásjelszónak legalább 4 karakter hosszúnak kell lennie" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Alkalmazásjelszók" +msgstr "Alkalmazásjelszók<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Alkalmazásjelszók" @@ -1307,19 +1225,12 @@ msgstr "Felfüggesztés fellebbezése" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Döntés fellebbezése" +msgstr "Döntés fellebbezése<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Megjelenés" @@ -1331,23 +1242,14 @@ msgstr "Ajánlott hírfolyamok elfogadása" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Lekéréses kérelem alkalmazása" +msgstr "Lekéréses kérelem alkalmazása<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archiválás dátuma: {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archiválás dátuma: {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Archivált bejegyzés" @@ -1416,18 +1318,11 @@ msgstr "Témakör hozzárendelése" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Adj meg legalább 8 karaktert" +msgstr "Adj meg legalább 8 karaktert<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Sarki Fény" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Elérhető" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Elérhető" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Vissza a csevegésekhez" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Tiltott tartalom vagy biztonsági kockázat" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Vissztérő kitiltott felhasználó" ->>>>>>> upstream/main +msgstr "Vissztérő kitiltott felhasználó>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Az életkor-igazolási folyamat megkezdéséhez töltsd ki az alábbi me #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Születésnap" +msgstr "Születésnap<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Letiltás" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Fiók letiltása" @@ -1579,15 +1446,8 @@ msgstr "Fiókok letiltása" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Letiltás és törlés" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "A másik fél letiltása és/vagy a beszélgetés törlése" +msgstr "Letiltás és törlés<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Lista letiltása" @@ -1607,18 +1467,14 @@ msgstr "Felhasználó letiltása" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Felhasználó letiltása" +msgstr "Felhasználó letiltása<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "A másik fél letiltása és/vagy a beszélgetés törlése" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Letiltva" @@ -1650,40 +1506,18 @@ msgstr "A letiltás nyilvános. Az általad letiltott fiókok nem képesek vála #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "A fiók letiltása nem fogja megakadályozni a feljegyzések hozzárendelését a saját fiókodhoz, viszont a letiltott fiók nem lesz képes válaszolni a bejegyzéseidre és egyéb módon kapcsolatba lépni Veled." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "A Bluesky nem tudja megerősíteni a létrehozás dátumát." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "A fiók letiltása nem fogja megakadályozni a feljegyzések hozzárendelését a saját fiókodhoz, viszont a letiltott fiók nem lesz képes válaszolni a bejegyzéseidre és egyéb módon kapcsolatba lépni Veled.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "A Bluesky nem tudja megerősíteni a létrehozás dátumát." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Klasszikus Bluesky" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "A Bluesky egy nyílt hálózat, ahol saját szolgáltatót választhatsz. Ha fejlesztő vagy, saját kiszolgálót is üzemeltethetsz." @@ -1735,15 +1569,9 @@ msgstr "Könyvek" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "A Bluesky szabályzatának megszegése" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "További fiókokat a Felfedezés oldalon találsz" @@ -1854,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Újraaktiválás megszakítása és kilépés" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Keresés megszakítása" +msgstr "Keresés megszakítása<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Egy letiltott felhasználóval nem léphetsz kapcsolatba" @@ -1955,11 +1771,7 @@ msgstr "Jelszó-megváltoztatási párbeszédablak" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Jelentési kategória megváltoztatása" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Csevegési kérelmek" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Küldtünk egy e-mailt. Add meg a benne található ellenőrzőkódot:" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" msgstr "" -======= -msgstr "Gyermekvédelem" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Gyermekpornográfia" ->>>>>>> upstream/main +msgstr "Gyermekpornográfia>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Kipp 🐴 kopp 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Köszöntő-párbeszédablak bezárása" msgid "Closes password update alert" msgstr "Jelszófrissítési figyelmeztetés bezárása" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "A bejegyzésíró bezárása és a piszkozat elvetése" @@ -2350,7 +2142,7 @@ msgstr "Egy bejegyzés legfeljebb {0, plural, other{#}} karakter hosszú lehet" msgid "Compose reply" msgstr "Válaszírás" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Videó tömörítése folyamatban…" @@ -2472,11 +2264,7 @@ msgstr "Ez a tartalom nem elérhető" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Önkárosítás ábrázolása vagy népszerűsítése" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Szerző DID-jének másolása" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kód másolása" +msgstr "Kód másolása<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID másolása" @@ -2756,7 +2538,7 @@ msgstr "Regisztráció" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Regisztráció" @@ -2817,35 +2599,16 @@ msgstr "Egyéni" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Testreszabás" +msgstr "Testreszabás<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Add meg, hogy ki léphet kapcsolatba ezzel a bejegyzéssel." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "A Bluseky-élményed testreszabása" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Veszélyes kihívások vagy tevékenységek" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Káros szer- vagy droghasználat" @@ -2854,7 +2617,6 @@ msgstr "Káros szer- vagy droghasználat" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Lekapcsolt" @@ -2891,19 +2653,13 @@ msgstr "Hibakeresési panel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Hamisított felnőtt tartalom („deepfake”)" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Alapértelmezett" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Alapértelmezett ikonok" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Kétlépcsős azonosítás kikapcsolása" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Rezgés letiltása" +msgstr "Rezgés letiltása<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Válaszadás letiltása>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Válaszadás letiltása" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Új hírfolyamok felfedezése" msgid "Dismiss" msgstr "Bezárás" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Hiba bezárása" @@ -3271,11 +3014,8 @@ msgstr "Ne aggódj! A korábbi üzeneteid és beállításaid nem vesztek el és #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "A Bluesky letöltése" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR fájl letöltése" +msgstr "CAR fájl letöltése<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Személyes információ kiszivárogtatása" ->>>>>>> upstream/main +msgstr "Személyes információ kiszivárogtatása>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "pl.: Akik folyton csak reklámokkal válaszolnak." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Étkezési zavar" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Szerkesztés" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Profilkép szerkesztése" @@ -3693,7 +3423,7 @@ msgstr "Teljes képernyős mód" msgid "Entertainment" msgstr "Szórakozás" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Hiba" @@ -3714,11 +3444,11 @@ msgstr "Hibaüzenet" msgid "Error occurred while saving file" msgstr "A fájl mentése meghiúsult" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "A captcha válaszának fogadása meghiúsult." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Hiba: {error}" @@ -3740,19 +3470,8 @@ msgstr "Bárkitől" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Minden más" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Túl sok említés vagy válasz" +msgstr "Minden más<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Túl sok- vagy nem kívánt üzenetek" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Követett felhasználók kihagyása a szűrésből" @@ -3876,11 +3595,7 @@ msgstr "Külső médiatartalmak" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Szélsőséges tartalom" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "A felhasználónév hitelesítése meghiúsult. Próbáld újra." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "Hamis vagy automatikusan üzemeltetett fiók" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Választási dezinformáció" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Hírfolyam" @@ -4241,26 +3946,8 @@ msgstr "Befejezés" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitnesz" +msgstr "Fitnesz<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Egyszerű Fekete" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Egyszerű Kék" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Egyszerű Fehér" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Rugalmas" @@ -4271,16 +3958,7 @@ msgstr "Rugalmas" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Követés" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Követés" @@ -4323,16 +4001,8 @@ msgstr "Összes fiók követése" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Követés kölcsönzése" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Követés kölcsönzése" @@ -4372,13 +4042,9 @@ msgstr "Ismert követők" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Követett" @@ -4386,16 +4052,11 @@ msgstr "Követett" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Követett" +msgstr "Követett<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Mostantól követed: {0}" @@ -4482,15 +4143,8 @@ msgstr "Elfelejtetted?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Szabadítsd fel a hírfolyamodat!" +msgstr "Szabadítsd fel a hírfolyamodat!<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Gyakran tesz közzé kéretlen tartalmakat" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Forrás" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Adj arcot a profilodnak!" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "A törvény vagy a felhasználási feltételek egyértelmű megszegése" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Az erőszak népszerűsítése" ->>>>>>> upstream/main +msgstr "Adj arcot a profilodnak!<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,18 +4356,7 @@ msgstr "Grafikus médiatartalom" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "Az erőszak látványos megjelenítése" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4731,8 +4364,7 @@ msgstr "Kiskorúak kizsákmányolása vagy szexuális ragadozás" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Informatikai rendszerek feltörése (hackelés) vagy támadása" ->>>>>>> upstream/main +msgstr "Informatikai rendszerek feltörése (hackelés) vagy támadása>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Rezgés" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Zaklatás, gúnyolódás vagy tűrélytelenség" -======= -msgstr "Zaklatás vagy gyűlölet" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Veszélyes vagy káros tevékenységek" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Kiskorúak veszélyeztetése vagy károsítása" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Címke: {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Gyűlöletbeszéd" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Ha már rendelkezel kóddal, <0>kattints ide." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Problémába ütköztél?" +msgstr "Problémába ütköztél?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Testreszabási lehetőségek elrejtése" +msgstr "Testreszabási lehetőségek elrejtése<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Listák elrejtése" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Bejegyzés elrejtése helyileg" @@ -5015,11 +4613,7 @@ msgstr "Hogyan nyissuk meg ezt a hivatkozást?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Embercsempészet" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Ha fejlesztő vagy, saját kiszolgálót is üzemeltethetsz." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Ha meg akarod változtatni a felhasználónevedet vagy az e-mail-címedet, azt még a deaktiválás előtt tedd meg!" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegális és sürgős" +msgstr "Ha meg akarod változtatni a felhasználónevedet vagy az e-mail-címedet, azt még a deaktiválás előtt tedd meg!<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Kép" @@ -5113,29 +4699,15 @@ msgstr "Kép elmentve" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Fényképek mentéséhez a galériához való hozzáférés szükséges." +msgstr "Fényképek mentéséhez a galériához való hozzáférés szükséges.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Megszemélyesítés vagy a kilétéről/hovatartozásáról szóló valótlan állítások" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Megszemélyesítés, dezinformáció vagy valótlan állítások" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Megszemélyesítés" ->>>>>>> upstream/main +msgstr "Megszemélyesítés>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Alkalmazáson belüli, leküldéses, mindenkitől" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Alkalmazáson belüli, leküldéses, az Általad követett személyektől" +msgstr "Alkalmazáson belüli, leküldéses, az Általad követett személyektől<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Illetlen üzenetek vagy hivatkozások" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Jelszó megadása a fiók törléséhez" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "E-mailben kapott kód megadása" +msgstr "E-mailben kapott kód megadása<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "A kapcsolatbalépés korlátozott" @@ -5287,7 +4844,7 @@ msgstr "Még csak <0>{0} személy szerepel a kezdőcsomagban. A fenti keres msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Még csak Te szerepelsz a kezdőcsomagban. A fenti keresővel másokat is hozzáadhatsz." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Állásazonosító: {0}" @@ -5330,17 +4887,13 @@ msgstr "Feljegyezte a(z) {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Feljegyezte a szerző." +msgstr "Feljegyezte a szerző.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Feljegyzések" @@ -5405,17 +4958,9 @@ msgstr "További információ" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "További információ az életkor-igazolásról" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "További információ a Blueskyról" +msgstr "További információ az életkor-igazolásról<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "További információ a személyes adatkiszolgálók üzemeltetéséről." @@ -5450,15 +4995,10 @@ msgstr "További információ a Bluesky-tartalmak nyilvánosságáról." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "További információ a <0>fiókbeállításokban." +msgstr "További információ a <0>fiókbeállításokban.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "További információ." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Tetszik" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Tetszik ({0, plural, one {# kedvelés} other {# kedvelés}})" @@ -5589,13 +5125,9 @@ msgstr "Megosztott bejegyzések kedvelése" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Értesítések megosztott bejegyzések kedveléséről" +msgstr "Értesítések megosztott bejegyzések kedveléséről<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "A bejegyzést kedvelők" @@ -5899,49 +5431,24 @@ msgstr "Üzenetlehetőségek" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Üzenetek" +msgstr "Üzenetek<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Éjfél" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Kiskorúak zaklatása" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Egyéb értesítések" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Félrevezető fiók" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Félrevezető bejegyzés" -======= -msgstr "Félrevezető tartalom" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Moderálási eszközök" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Ezen a tartalmon általános figyelmeztetés van érvényben, egy moderátor döntése alapján." +msgstr "Ezen a tartalmon általános figyelmeztetés van érvényben, egy moderátor döntése alapján.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "További hírfolyamok" @@ -6150,18 +5652,8 @@ msgstr "Hírfolyamgyűjtemény" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Név" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "A címe vagy a leírása megszegi a közösségi irányelveket" - -======= ->>>>>>> upstream/main +msgstr "Név<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Nincs előnézet" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Még nincsenek kedvelések" +msgstr "Még nincsenek kedvelések<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Abbahagytad {0} követését" @@ -6386,7 +5873,7 @@ msgstr "Még nincsenek üzenetek" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Vess véget a szeméttel teli hírfolyamok örökös görgetésének! Inkább találj olyan tartalmakat, amelyek érted és nem ellened dolgoznak!" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Még nincsenek értesítéseid." @@ -6440,9 +5927,9 @@ msgstr "Nincs találat" msgid "No results found for \"{query}\"" msgstr "A(z) „{query}” kifejezésre nincs találat" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "A(z) „{query}” kifejezésre nincs találat" @@ -6482,11 +5969,7 @@ msgstr "Nincs találat. Próbálj rákeresni valaki másra." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Intim területeket ábrázoló nem szexuális képek" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Épp most" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Meztelenség" +msgstr "Meztelenség<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nem megjelölt meztelenség vagy felnőtt tartalom" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Oké" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Oldalsó menü megnyitása" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Emojiválasztó megnyitása" @@ -6815,7 +6287,7 @@ msgstr "Bejegyzésíró megnyitása" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "A készülék galériájának megnyitása. A bejegyzéshez legfeljebb {MAX_IMAGES, plural, other {# kép}}, vagy egy videó vagy GIF csatolható." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Emojiválasztó megnyitása" @@ -6855,15 +6327,10 @@ msgstr "Jelszóvisszaállítási űrlap megnyitása" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Bejegyzések nyelvi beállításainak megnyitása" +msgstr "Bejegyzések nyelvi beállításainak megnyitása<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Saját profil megnyitása" @@ -6897,12 +6364,7 @@ msgstr "Frissítési állapot: Nincs elérhető frissítés" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Egyéb" @@ -6912,35 +6374,8 @@ msgstr "Másik fiók" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Egyéb gyermekvédelmi probléma" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Egyéb veszélyes tartalom" @@ -6963,8 +6398,7 @@ msgstr "Egyéb szexuálisan kizsákmányoló tartalom" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Egyéb erőszakos tartalom" ->>>>>>> upstream/main +msgstr "Egyéb erőszakos tartalom>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Az őt követő személyek: @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Követett személyektől" +msgstr "Követett személyektől<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Az Általad követett személyek" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Az Általad megemlített személyek" +msgstr "Az Általad megemlített személyek>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "A galéria hozzáférését megtagadták. Engedélyezd a rendszerbeállításokban." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Bejegyzés" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Közzététel" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Összes közzététele" @@ -7341,19 +6768,12 @@ msgstr "Törölted a bejegyzést" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "A bejegyzés közzététele meghiúsult. Ellenőrizd az internetkapcsolatot, majd próbáld újra." +msgstr "A bejegyzés közzététele meghiúsult. Ellenőrizd az internetkapcsolatot, majd próbáld újra.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Ezt a bejegyzést törölték." @@ -7487,13 +6907,9 @@ msgstr "Adatvédelmi irányelvek" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kiskorúak személyes jogainak megsértése" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Videó feldolgozása folyamatban…" @@ -7521,15 +6937,11 @@ msgstr "Profil frissítve" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tiltott eszközök vagy szolgáltatások árusítása" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psszt! Ha szeretnéd, akkor megszabhatod, hogy ki léphet kapcsolatba ezzel a bejegyzéssel." ->>>>>>> upstream/main +msgstr "Psszt! Ha szeretnéd, akkor megszabhatod, hogy ki léphet kapcsolatba ezzel a bejegyzéssel.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Nyilvános, megosztható listák, amelyek hírfolyamként üzemelhetnek." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Bejegyzés közzététele" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Bejegyzések közzététele" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Válaszok közzététele" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Válasz közzététele" @@ -7622,13 +7034,9 @@ msgstr "Idézés letiltva" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Idézések" +msgstr "Idézések<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "A bejegyzés idézései" @@ -7689,12 +7097,12 @@ msgstr "A Bluesky felhasználói feltételeinek megtekintése" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Melléklet eltávolítása" msgid "Remove Avatar" msgstr "Profilkép eltávolítása" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Borítókép eltávolítása" @@ -7960,17 +7368,13 @@ msgstr "Válaszadás letiltva" msgid "Replies to this post are disabled." msgstr "A bejegyzés alatti válaszadás le van tiltva." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Válasz közzététele" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Válasz írása ({0, plural, one {# válasz} other {# válasz}})" @@ -8060,11 +7464,7 @@ msgstr "A jelentést megkaptuk" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Beszélgetés jelentése" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Megosztottad" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Megosztások" +msgstr "Megosztások<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "A bejegyzés megosztásai" @@ -8214,17 +7610,13 @@ msgstr "Regisztrációs varázsló állapotának alaphelyzetbe állítása" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Jelszó helyreállítása" +msgstr "Jelszó helyreállítása<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Bejelentkezés újrapróbálása" @@ -8377,28 +7769,21 @@ msgstr "Köszönj!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Átverés" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Tudomány" +msgstr "Tudomány<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Görgetés balra" @@ -8443,11 +7828,11 @@ msgstr "Keresés: {interestsDisplayName}" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Keresés: {interestsDisplayName} (aktív)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Keresés: {query}" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Keresés: {searchText}" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF-ek keresése" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "A kereséshez jelenleg bejelentkezés szükséges" @@ -8565,11 +7950,7 @@ msgstr "Szín kiválasztása" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Indok megadása" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "Egy bejegyzéshez csak egyféle médiatartalom csatolható." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Önkárosítás vagy veszélyes viselkedés" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Születési dátum megadása" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Új jelszó beállítása" +msgstr "Új jelszó beállítása<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "A megengedett személyek csoportjainak pontos megszabása" +msgstr "A megengedett személyek csoportjainak pontos megszabása>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Fiók beállítása" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Válaszok megjelenítése" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Válaszok megjelenése" +msgstr "Válaszok megjelenése<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Válasz megjelenítése mindenkinek" @@ -9062,13 +8423,9 @@ msgstr "Figyelmeztetés" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Figyelmeztetés és kiszűrés a hírfolyamokból" +msgstr "Figyelmeztetés és kiszűrés a hírfolyamokból<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "További információ a bejegyzés dátumáról" @@ -9089,7 +8446,7 @@ msgstr "Tartalom megjelenítése" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Forrás: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; túl sok említés vagy válasz" -======= -msgstr "Hamis/kéretlen tartalom vagy átverés" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Számodra javasolt" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Felnőtt tartalom" +msgstr "Felnőtt tartalom<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Alkonyat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Szürkület" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Koppints ide a bezáráshoz" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Célzott zaklatás" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9609,18 +8935,8 @@ msgstr "Feltételek" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Felhasználási feltételek" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "A közösségi irányelveket megszegő kifejezések" - -======= ->>>>>>> upstream/main +msgstr "Felhasználási feltételek<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Szöveg és címkék" @@ -9669,11 +8985,7 @@ msgid "That's everything!" msgstr "Ez minden!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "A fiók ismét képes lesz kapcsolatba lépni veled, ha feloldod a letiltását." @@ -9805,17 +9117,12 @@ msgstr "Megszakadt a kapcsolat a kiszolgálóval" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Megszakadt a kapcsolat a kiszolgálóval. Ellenőrizd az internetkapcsolatot, majd próbáld újra." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Az értesítések frissítése meghiúsult. Koppints ide az újrapróbálkozáshoz." +msgstr "Az értesítések frissítése meghiúsult. Koppints ide az újrapróbálkozáshoz.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "A bejegyzések lekérése meghiúsult. Koppints ide az újrapróbálkozáshoz." @@ -9854,16 +9161,9 @@ msgstr "A hírfolyamok frissítése meghiúsult. Ellenőrizd az internetkapcsola #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9891,21 +9191,15 @@ msgstr "Váratlan alkalmazáshiba történt. Kérjük jelentsd!" #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Jelenleg rengeteg új felhasználó csatlakozik a Blueskyhoz. A fiókodat aktiválni fogjuk, amint tudjuk!" +msgstr "Jelenleg rengeteg új felhasználó csatlakozik a Blueskyhoz. A fiókodat aktiválni fogjuk, amint tudjuk!<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Ezek az alapértelmezett beállítások" ->>>>>>> upstream/main +msgstr "Ezek az alapértelmezett beállítások>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10057,13 +9351,9 @@ msgstr "Ez a lista üres." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Ez a moderálási szolgáltatás jelenleg nem elérhető. A részleteket alább olvashatod. Ha a probléma fennáll, lépj velünk kapcsolatba." +msgstr "Ez a moderálási szolgáltatás jelenleg nem elérhető. A részleteket alább olvashatod. Ha a probléma fennáll, lépj velünk kapcsolatba.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "A bejegyzés adatai szerint az eredeti létrehozási dátuma <0>{0} volt, de először ekkor jelent meg a Blueskyon: <1>{1}" @@ -10181,11 +9471,7 @@ msgstr "Válaszlánc-beállítások" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Fenyegetés vagy felbujtás" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10235,17 +9521,10 @@ msgstr "Témakör" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Lefordítás" @@ -10264,11 +9543,7 @@ msgstr "Felkapott videók" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Provokálás („trollkodás”)" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10371,22 +9646,13 @@ msgstr "Tiltás feloldása" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Fiók tiltásának feloldása" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Fiók tiltásának feloldása" @@ -10408,16 +9674,8 @@ msgstr "Megosztás visszavonása" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Megosztás visszavonása ({0, plural, one {# megosztás} other {# megosztás}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Követés megszüntetése" +msgstr "Megosztás visszavonása ({0, plural, one {# megosztás} other {# megosztás}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} követésének megszüntetése" @@ -10445,32 +9703,18 @@ msgstr "Ismeretlen hitelesítő" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Nem megfelelően megjelölt felnőtt tartalom" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Nem megfelelően megjelölt, abuzív vagy kölcsönös beleegyezés nélküli felnőtt tartalom" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Mégse tetszik" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Kedvelés visszavonása ({0, plural, one {# kedvelés} other {# kedvelés}})" @@ -10581,16 +9825,8 @@ msgstr "Leiratkoztál a listáról" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Nem támogatott videóformátum: {mimeType}" +msgstr "Nem támogatott videóformátum: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Kéretlen szexuális tartalom" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10640,20 +9876,20 @@ msgstr "Tölts fel ide egy szöveges fájlt:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Feltöltés a kamerából" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Feltöltés a fájlkezelőből" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Feltöltés a galériából" @@ -10666,7 +9902,7 @@ msgstr "Képek feltöltése folyamatban…" msgid "Uploading link thumbnail..." msgstr "Hivatkozás indexképének feltöltése folyamatban…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Videó feltöltése folyamatban…" @@ -10920,7 +10156,7 @@ msgstr "A videó nem található." msgid "Video settings" msgstr "Videóbeállítások" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "A videó feltöltése sikeresen befejeződött" @@ -10945,10 +10181,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Megtekintés" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0} profilképének megtekintése" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10971,15 +10211,10 @@ msgstr "További részleteket a blogbejegyzésben olvashatsz (angolul)" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Hibakeresési bejegyzés megtekintése" +msgstr "Hibakeresési bejegyzés megtekintése<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Részletek" @@ -11015,10 +10250,6 @@ msgstr "Bejegyzés megtekintése" msgid "View profile" msgstr "Profil megtekintése" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Profilkép megtekintése" @@ -11062,15 +10293,10 @@ msgstr "Elnémított fiókok megjelenítése" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Saját hitelesítések megtekintése" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Saját hitelesítések megtekintése<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Teljes kép megtekintése" @@ -11080,24 +10306,16 @@ msgstr "Videó vezérlőinek elrejtése" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Erőszakos vagy fenyegető tartalom>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Erőszak" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Erőszakos vagy fenyegető tartalom" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11247,7 +10465,7 @@ msgstr "Sajnáljuk, de a lista lekérése meghiúsult. Ha a probléma fennáll, msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Sajnáljuk, de az elnémított szavak listájának betöltése meghiúsult. Próbáld újra." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Sajnáljuk, de a keresés meghiúsult. Próbáld újra egy pár percen belül." @@ -11348,11 +10566,7 @@ msgstr "Mi a fellebbezés tárgya?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Miért kell ezt a beszélgetést átvizsgálni?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11379,13 +10593,8 @@ msgid "Why should this user be reviewed?" msgstr "Miért kell ezt a felhasználót átvizsgálni?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Szeretnéd letiltani ezt a felhasználót és/vagy törölni a beszélgetést?" ->>>>>>> upstream/main +msgstr "Szeretnéd letiltani ezt a felhasználót és/vagy törölni a beszélgetést?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11819,11 +11028,7 @@ msgstr "Jelenleg egy alkalmazásjelszóval vagy bejelentkezve. A fiókod deaktiv #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "A fellebbezés elbírálása már folyamatban van." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/ia/messages.po b/src/locale/locales/ia/messages.po index 8f6ef0bab..476401369 100644 --- a/src/locale/locales/ia/messages.po +++ b/src/locale/locales/ia/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {sequitor} other {sequitores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {sequito} other {sequitos}}" +msgstr "{0, plural, one {sequito} other {sequitos}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {appreciation} other {appreciationes}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publication} other {publicationes}}" +msgstr "{0, plural, one {publication} other {publicationes}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citation} other {citationes}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republication} other {republicationes}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citation} other {citationes}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republication} other {republicationes}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} a {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Accessibilitate" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Parametros de accessibilitate" +msgstr "Parametros de accessibilitate<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conto" +msgstr "Conto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Conto blocate" @@ -661,26 +634,18 @@ msgstr "Conto silentiate per lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Optiones de conto" +msgstr "Optiones de conto<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Conto removite del accesso rapide" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Conto disblocate" @@ -770,7 +735,7 @@ msgstr "Adder altere conto" msgid "Add another post" msgstr "Adder un altere publication" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contento pro adultos" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Un illustration monstrante que Bluesky selige verificatores de confidentia qui, a su vice, verifica contos de usatores individual." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema non includite in iste optiones" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Annuncio del verification super Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamento antisocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Annuncio del verification super Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Le nomines de contrasigno de application debe haber al minus 4 character #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Contrasignos de application" +msgstr "Contrasignos de application<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Contrasignos de application" @@ -1283,19 +1225,12 @@ msgstr "Facer appello del suspension" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Facer appello de iste decision" +msgstr "Facer appello de iste decision<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Apparentia" @@ -1307,23 +1242,14 @@ msgstr "Applicar le canales recommendate predefinite" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archivate desde {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archivate desde {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publication archivate" @@ -1392,18 +1318,11 @@ msgstr "Assignar topico pro le algorithmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Data de nascentia" +msgstr "Data de nascentia<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blocar" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blocar conto" @@ -1547,15 +1446,8 @@ msgstr "Blocar contos" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocar e deler" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blocar e/o deler iste conversation" +msgstr "Blocar e deler<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blocar lista" @@ -1575,18 +1467,14 @@ msgstr "Blocar usator" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocar usator" +msgstr "Blocar usator<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blocate" @@ -1618,40 +1506,18 @@ msgstr "Le blocage es public. Contos blocate non pote responder in tu filos, men #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Le blocage non impedi le application de etiquettas a tu conto, mais iste conto non potera responder in tu filos o interager con te." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky non pote confirmar le authenticitate del data declarate." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Le blocage non impedi le application de etiquettas a tu conto, mais iste conto non potera responder in tu filos o interager con te.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky non pote confirmar le authenticitate del data declarate." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky es un rete aperte ubi tu pote eliger tu fornitor de albergamento. Si tu es un disveloppator, tu pote albergar tu proprie servitor." @@ -1703,13 +1569,9 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Percurre altere contos super le pagina Explorar" @@ -1820,19 +1682,13 @@ msgstr "Camera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Cancellar le reactivation e clauder session" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancellar cerca" +msgstr "Cancellar cerca<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Impossibile interager con un usator blocate" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Requestas de chat" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Cataclop 🐴 cataclop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Claude le alerta de actualisation de contrasigno" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Claude le fenestra de redaction e discarta le minuta del publication" @@ -2304,7 +2142,7 @@ msgstr "Redige publicationes de usque a {0, plural, other {# characteres}}" msgid "Compose reply" msgstr "Scriber un responsa" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Compression del video in curso..." @@ -2534,17 +2372,11 @@ msgstr "Copiar le DID del autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar codice" +msgstr "Copiar codice<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar DID" @@ -2706,7 +2538,7 @@ msgstr "Crear conto" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crear un conto" @@ -2767,15 +2599,8 @@ msgstr "Personalisate" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Optiones de personalisation" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalisa qui pote interager con iste publication." +msgstr "Optiones de personalisation<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personalisa tu experientia de Bluesky" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Obscur" @@ -2835,17 +2653,13 @@ msgstr "Pannello de depuration" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Predefinite" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Icones predefinite" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Disactivar le 2FA per e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Disactivar le retroaction haptic" +msgstr "Disactivar le retroaction haptic<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Discoperir nove canales" msgid "Dismiss" msgstr "Clauder" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Clauder error" @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Discargar Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Discargar file CAR" +msgstr "Discargar file CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Modificar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Modificar avatar" @@ -3627,7 +3423,7 @@ msgstr "Passa a plen schermo" msgid "Entertainment" msgstr "Intertenimento" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Error" @@ -3648,11 +3444,11 @@ msgstr "Message de error" msgid "Error occurred while saving file" msgstr "Un error ha occurrite durante le salvamento del file" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Error durante le reception del responsa al captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Error: {error}" @@ -3674,19 +3470,8 @@ msgstr "Totes" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tote le resto" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mentiones o responsas excessive" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Messages excessive o indesirabile" +msgstr "Tote le resto<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluder usatores que tu seque" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Canal" @@ -4165,26 +3946,8 @@ msgstr "Finir" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Nigro" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Blau" +msgstr "Fitness<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Blanco" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexibile" @@ -4195,16 +3958,7 @@ msgstr "Flexibile" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Sequer" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Sequer" @@ -4247,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Sequer in retorno" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Sequer in retorno" @@ -4296,13 +4042,9 @@ msgstr "Sequitores que tu cognosce" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Sequente" @@ -4310,16 +4052,11 @@ msgstr "Sequente" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Sequente" +msgstr "Sequente<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Sequente {0}" @@ -4406,15 +4143,8 @@ msgstr "Tu lo ha oblidate?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publica con frequentia contentos indesirabile" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Da un facie a tu profilo" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violationes flagrante al lege o al conditiones de servicio" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Da un facie a tu profilo<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Technologia haptic" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Molestia, importunation o intolerantia" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "Tu ha un codice? <0>Clicca hic." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Problemas?" +msgstr "Problemas?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Occultar optiones de personalisation" +msgstr "Occultar optiones de personalisation<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Occultar le publication pro me" @@ -4985,17 +4677,9 @@ msgstr "Si tu es un disveloppator, tu pote hospitar tu proprie servitor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Si tu tenta cambiar de pseudonymo o de adresse de e-mail, face lo ante disactivar." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegal e urgente" +msgstr "Si tu tenta cambiar de pseudonymo o de adresse de e-mail, face lo ante disactivar.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imagine" @@ -5015,29 +4699,15 @@ msgstr "Imagine salvate" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Imagines non pote esser salvate a minus que tu concede permission de accesso a tu bibliotheca de photos." +msgstr "Imagines non pote esser salvate a minus que tu concede permission de accesso a tu bibliotheca de photos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Usurpation de identitate o affirmationes false super identitate o affiliation" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Usurpation de identitate, disinformation o affirmationes false" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "Interne al application, push, totes" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Interne al application, push, personas que tu seque" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Messages inappropriate o ligamines explicite" +msgstr "Interne al application, push, personas que tu seque<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Insere le contrasigno pro le deletion del conto" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Insere le codice que ha essite inviate a tu e-mail" +msgstr "Insere le codice que ha essite inviate a tu e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaction limitate" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Tu es le unic al momento! Adde plus personas a tu pacchetto de initio cercante hic supra." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID del processo: {0}" @@ -5232,17 +4887,13 @@ msgstr "Etiquettate per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquettate per le autor." +msgstr "Etiquettate per le autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiquettas" @@ -5307,17 +4958,9 @@ msgstr "Saper plus" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Saper plus super Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Saper plus super le auto-albergamento de tu PDS." @@ -5352,15 +4995,10 @@ msgstr "Saper plus super lo que es public super Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Saper plus." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Appreciar" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Appreciar ({0, plural, one {# appreciation} other {# appreciationes}})" @@ -5491,13 +5125,9 @@ msgstr "Appreciationes de tu republicationes" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificationes de appreciationes de tu republicationes" +msgstr "Notificationes de appreciationes de tu republicationes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Appreciationes de iste publication" @@ -5801,45 +5431,23 @@ msgstr "Optiones de messages" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages" +msgstr "Messages<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Medienocte" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Notificationes diverse" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Conto fraudulente" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publication fallace" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Instrumentos de moderation" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Le moderator ha optate pro poner un advertimento general super le contento." +msgstr "Le moderator ha optate pro poner un advertimento general super le contento.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Plus canales" @@ -6049,18 +5652,8 @@ msgstr "Mi canales" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nomine" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nomine o description viola le standards del communitate" - -======= ->>>>>>> upstream/main +msgstr "Nomine<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "Necun imagine" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Necun appreciation ancora" +msgstr "Necun appreciation ancora<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Non plus sequente {0}" @@ -6285,7 +5873,7 @@ msgstr "Ancora sin messages" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ancora sin notificationes!" @@ -6339,9 +5927,9 @@ msgstr "Necun resultato trovate" msgid "No results found for \"{query}\"" msgstr "Necun resultato trovate pro \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Necun resultato trovate pro {query}" @@ -6476,15 +6064,8 @@ msgstr "Ora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuditate" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nuditate o contento pro adultos non etiquettate como tal" +msgstr "Nuditate<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "OK" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Aperir le menu lateral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Aperir selector de emojis" @@ -6710,7 +6287,7 @@ msgstr "Aperi le fenestra de redaction" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Aperi le selector de emojis" @@ -6750,15 +6327,10 @@ msgstr "Aperi le formulario de reinitialisation de contrasigno" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Aperi iste profilo" @@ -6792,12 +6364,7 @@ msgstr "Stato OTA: Necun disponibile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Altere" @@ -6907,23 +6474,16 @@ msgstr "Personas qui seque @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Personas que io seque" +msgstr "Personas que io seque<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Le permission pro acceder a tu bibliotheca de photos ha essite negate. Activa lo in le parametros de tu systema." @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publication" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar toto" @@ -7208,19 +6768,12 @@ msgstr "Publication delite" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Non ha essite possibile cargar le publication. Verifica tu connexion al Internet e tenta de novo." +msgstr "Non ha essite possibile cargar le publication. Verifica tu connexion al Internet e tenta de novo.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Le publication ha essite delite" @@ -7356,7 +6909,7 @@ msgstr "Politica de privatessa" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Processante video..." @@ -7384,19 +6937,12 @@ msgstr "Profilo actualisate" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Public" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listas public e compartibile que pote esser usate pro alimentar canales." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicar" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicar publicationes" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicar responsas" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicar responsa" @@ -7488,13 +7034,9 @@ msgstr "Citationes disactivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citationes" +msgstr "Citationes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citationes de iste publication" @@ -7555,12 +7097,12 @@ msgstr "Lege le conditiones de servicio de Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Remover annexo" msgid "Remove Avatar" msgstr "Remover avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Remover banner" @@ -7826,17 +7368,13 @@ msgstr "Responsas disactivate" msgid "Replies to this post are disabled." msgstr "Responsas a iste publication es disactivate." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responsa" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Responsa ({0, plural, one {# responsa} other {# responsas}})" @@ -7997,13 +7535,9 @@ msgstr "Republicate per te" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicationes" +msgstr "Republicationes<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicationes de iste publication" @@ -8076,17 +7610,13 @@ msgstr "Reinitialisar stato de apprentissage" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reinitialisar contrasigno" +msgstr "Reinitialisar contrasigno<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Tenta aperir session de novo" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scientia" +msgstr "Scientia<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Cercar pro \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Cercar pro \"{searchText}\"" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Cercar GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8630,19 +8157,12 @@ msgstr "Definir data de nascentia" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir nove contrasigno" +msgstr "Definir nove contrasigno<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configurar tu conto" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Monstrar responsas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Monstrar responsas como" +msgstr "Monstrar responsas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Monstrar responsa pro totes" @@ -8912,13 +8423,9 @@ msgstr "Monstrar advertimento" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Monstrar advertimento e filtrar desde canales" +msgstr "Monstrar advertimento e filtrar desde canales<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Monstra information super quando iste publication ha essite create" @@ -8939,7 +8446,7 @@ msgstr "Monstra le contento" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Fonte: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; mentiones o responsas excessive" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Suggerite pro te" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestive" +msgstr "Suggestive<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Levar del sol" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Poner del sol" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Terminos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Conditiones de servicio" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Terminos usate viola de standards del communitate" - -======= ->>>>>>> upstream/main +msgstr "Conditiones de servicio<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto e etiquettas" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Illo es toto!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Le conto potera interager con te post le disblocage." @@ -9648,17 +9115,12 @@ msgstr "Il ha habite un problema durante le connexion con le servitor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Il ha habite un problema durante le connexion con le servitor, verifica tu connexion al internet e tenta de novo." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Il ha habite un problema durante le recuperation del notificationes. Tocca hic pro tentar de novo." +msgstr "Il ha habite un problema durante le recuperation del notificationes. Tocca hic pro tentar de novo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Il ha habite un problema durante le recuperation del publicationes. Tocca hic pro tentar de novo." @@ -9697,16 +9159,9 @@ msgstr "Il ha habite un problema durante le actualisation de tu canales, verific #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Il ha habite un problema impreviste in le application. Informa nos si is #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Il ha habite un grande quantitate de usatores nove a Bluesky! Nos activara tu conto le plus tosto possibile." +msgstr "Il ha habite un grande quantitate de usatores nove a Bluesky! Nos activara tu conto le plus tosto possibile.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Iste lista es vacue." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Iste servicio de moderation es indisponibile. Vide hic infra pro plus detalios. Si iste problema persiste, contacta nos." +msgstr "Iste servicio de moderation es indisponibile. Vide hic infra pro plus detalios. Si iste problema persiste, contacta nos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Iste publication affirma haber essite create in <0>{0}, mais illo ha essite vidite per Bluesky pro le prime vice in <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Topico" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducer" @@ -10205,22 +9644,13 @@ msgstr "Disblocar" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Disblocar conto" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Disblocar le conto?" @@ -10242,16 +9672,8 @@ msgstr "Disfacer republication" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Disfacer republication ({0, plural, one {# republication} other {# republicationes}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Cessar de sequer" +msgstr "Disfacer republication ({0, plural, one {# republication} other {# republicationes}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Cessar de sequer {0}" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Disappreciar" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Disappreciar ({0, plural, one {# appreciation} other {# appreciationes}})" @@ -10409,16 +9823,8 @@ msgstr "Cancellate le subscription del lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contento sexual indesirabile" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Incargar un file de texto a:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Cargar desde le camera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Cargar desde files" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Cargar desde bibliotheca" @@ -10494,7 +9900,7 @@ msgstr "Incargante imagines..." msgid "Uploading link thumbnail..." msgstr "Incargante miniatura de ligamine..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Incargante video..." @@ -10748,7 +10154,7 @@ msgstr "Video non trovate." msgid "Video settings" msgstr "Configurationes de video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video cargate" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Vider le avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Vider le publication de blog pro plus detalios" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vider entrata de depuration" +msgstr "Vider entrata de depuration<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Visualisar detalios" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Visualisar profilo" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Vider le avatar" @@ -10890,15 +10291,10 @@ msgstr "Vider tu contos silentiate" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vider tu verificationes" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Vider tu verificationes<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Vide le imagine complete" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Pardono, mais non ha essite possibile resolver iste lista. Si iste probl msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Pardono, mais non ha essite possibile cargar tu parolas silentiate in iste momento. Tenta de novo." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Pardono, mais non ha essite possibile completar tu cerca. Tenta de novo in alcun minutas." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Proque iste usator deberea esser revidite?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/id/messages.po b/src/locale/locales/id/messages.po index ad79acb24..f79e50dd9 100644 --- a/src/locale/locales/id/messages.po +++ b/src/locale/locales/id/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, other {pengikut}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, other {mengikuti}}" +msgstr "{0, plural, other {mengikuti}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {suka}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {postingan}}" +msgstr "{0, plural, other {postingan}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {kutipan}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {posting ulang}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {kutipan}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {posting ulang}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} pukul {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Masuk<1> atau <2>buat akun<3> <4>untuk mencari berita, olahraga, politik dan semuanya yang terjadi di Bluesky." @@ -611,30 +595,19 @@ msgstr "Aksesibilitas" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Pengaturan Aksesibilitas" +msgstr "Pengaturan Aksesibilitas<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Akun" +msgstr "Akun<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Akun diblokir" @@ -661,26 +634,18 @@ msgstr "Akun Dibisukan oleh Daftar" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Pengaturan akun" +msgstr "Pengaturan akun<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Akun dihapus dari akses cepat" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Akun batal diblokir" @@ -770,7 +735,7 @@ msgstr "Tambahkan akun lain" msgid "Add another post" msgstr "Tambahkan postingan lain" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Konten Dewasa" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Sebuah ilustrasi menampilkan Bluesky memilih verifikator terpercaya, dan verifikator terpercaya pada waktunya memverifikasi akun pengguna individual." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Masalah lain yang tidak termasuk dalam pilihan" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Mengumumkan verifikasi Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Perilaku Anti-Sosial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Mengumumkan verifikasi Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Nama sandi aplikasi harus terdiri dari minimal 4 karakter" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Sandi aplikasi" +msgstr "Sandi aplikasi<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Kata Sandi Aplikasi" @@ -1283,19 +1225,12 @@ msgstr "Banding Penangguhan" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Ajukan banding atas keputusan ini" +msgstr "Ajukan banding atas keputusan ini<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Tampilan" @@ -1307,23 +1242,14 @@ msgstr "Tambahkan feed bawaan yang direkomendasikan" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arsip dari {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arsip dari {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arsip postingan" @@ -1392,18 +1318,11 @@ msgstr "Tetapkan topik untuk algoritma" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Tanggal lahir" +msgstr "Tanggal lahir<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blokir" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blokir akun" @@ -1547,15 +1446,8 @@ msgstr "Blokir akun" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokir dan Hapus" +msgstr "Blokir dan Hapus<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blokir dan/atau hapus percakapan ini" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blokir daftar" @@ -1575,18 +1467,14 @@ msgstr "Blokir pengguna" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blokir Pengguna" +msgstr "Blokir Pengguna<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Diblokir" @@ -1618,40 +1506,18 @@ msgstr "Pemblokiran bersifat publik. Akun yang diblokir tidak dapat membalas uta #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Memblokir tidak akan mencegah label diterapkan pada akun Anda, tetapi akan menghentikan akun ini untuk membalas atau berinteraksi dengan Anda." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky tidak dapat memastikan keaslian tanggal yang diklaim." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Memblokir tidak akan mencegah label diterapkan pada akun Anda, tetapi akan menghentikan akun ini untuk membalas atau berinteraksi dengan Anda.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky tidak dapat memastikan keaslian tanggal yang diklaim." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky adalah jaringan terbuka yang memungkinkan Anda memilih penyedia hosting. Jika Anda adalah developer, Anda dapat menghosting server Anda sendiri." @@ -1703,13 +1569,9 @@ msgstr "Buku" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Jelajahi akun lainnya pada halaman Jelajah" @@ -1820,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Batalkan pengaktifan kembali dan keluar" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Batal mencari" +msgstr "Batal mencari<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Tidak dapat berinteraksi dengan pengguna yang diblokir" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Permintaan obrolan" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Keletak 🐴 keletuk 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Menutup peringatan pembaruan kata sandi" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Menutup komposer pos dan menghapus draf postingan" @@ -2304,7 +2142,7 @@ msgstr "Tulis postingan hingga {0, plural, other {# karakter}} panjangnya" msgid "Compose reply" msgstr "Tulis balasan" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Mengompres video..." @@ -2534,17 +2372,11 @@ msgstr "Salin DID pemosting" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Salin kode" +msgstr "Salin kode<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Salin DID" @@ -2706,7 +2538,7 @@ msgstr "Buat Akun" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Buat akun" @@ -2767,15 +2599,8 @@ msgstr "Kustom" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opsi penyesuaian" +msgstr "Opsi penyesuaian<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Sesuaikan siapa yang dapat berinteraksi dengan postingan ini." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Menyesuaikan pengalaman Bluesky Anda" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Gelap" @@ -2835,17 +2653,13 @@ msgstr "Panel awakutu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Standar" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Ikon bawaan" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Nonaktifkan Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Matikan respons haptik" +msgstr "Matikan respons haptik<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Temukan Feed Baru" msgid "Dismiss" msgstr "Tutup" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Abaikan kesalahan" @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Unduh Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Unduh berkas CAR" +msgstr "Unduh berkas CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Ubah" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Ubah avatar" @@ -3627,7 +3423,7 @@ msgstr "Masuk ke mode layar penuh" msgid "Entertainment" msgstr "Hiburan" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Galat" @@ -3648,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Terjadi kesalahan saat menyimpan berkas" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Kesalahan saat menerima respons captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Kesalahan: {error}" @@ -3674,19 +3470,8 @@ msgstr "Semua orang" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menyebut atau membalas secara berlebihan" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Pesan yang berlebihan atau tidak diinginkan" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Kecualikan pengguna yang Anda ikuti" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4165,26 +3946,8 @@ msgstr "Selesai" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Kebugaran" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Hitam Flat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Biru Flat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Putih Flat" +msgstr "Kebugaran<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Fleksibel" @@ -4195,16 +3958,7 @@ msgstr "Fleksibel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Ikuti" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Ikuti" @@ -4247,16 +4001,8 @@ msgstr "Ikuti semua akun" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Ikuti Balik" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Ikuti Balik" @@ -4296,13 +4042,9 @@ msgstr "Pengikut yang Anda kenal" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Mengikuti" @@ -4310,16 +4052,11 @@ msgstr "Mengikuti" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Mengikuti" +msgstr "Mengikuti<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Mengikuti {0}" @@ -4406,15 +4143,8 @@ msgstr "Lupa?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Bebaskan feed Anda" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Sering Memposting Konten yang Tidak Diinginkan" +msgstr "Bebaskan feed Anda<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Dari" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Beri wajah pada profil Anda" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Pelanggaran hukum atau ketentuan layanan secara terang-terangan" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Beri wajah pada profil Anda<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Haptik" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Pelecehan, unggah sulut, atau intoleransi" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "Punya kode? <0>Klik di sini." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Mengalami masalah?" +msgstr "Mengalami masalah?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Sembunyikan opsi penyesuaian" +msgstr "Sembunyikan opsi penyesuaian<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Sembunyikan postingan untuk saya" @@ -4985,17 +4677,9 @@ msgstr "Jika Anda merupakan pengembang, Anda bisa menghosting peladen Anda sendi #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Jika ingin mengubah panggilan atau email, lakukanlah sebelum Anda menonaktifkan akun." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal dan Urgen" +msgstr "Jika ingin mengubah panggilan atau email, lakukanlah sebelum Anda menonaktifkan akun.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Gambar" @@ -5015,29 +4699,15 @@ msgstr "Gambar tersimpan" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Gambar tidak dapat disimpan kecuali diizinkan untuk mengakses pustaka foto Anda." +msgstr "Gambar tidak dapat disimpan kecuali diizinkan untuk mengakses pustaka foto Anda.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Impersonasi atau klaim palsu tentang identitas atau afiliasi" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Impersonasi, misinformasi, atau klaim palsu" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "Dalam aplikasi, Push, Semua orang" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Dalam aplikasi, Push, Orang yang saya ikuti" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Pesan tidak pantas atau tautan eksplisit" +msgstr "Dalam aplikasi, Push, Orang yang saya ikuti<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Masukkan kata sandi untuk penghapusan akun" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Masukkan kode yang telah dikirim ke email Anda" +msgstr "Masukkan kode yang telah dikirim ke email Anda<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaksi dibatasi" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Hanya ada Anda saat ini! Tambahkan lebih banyak orang ke paket pemula Anda melalui pencarian di atas." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID Kerja: {0}" @@ -5232,17 +4887,13 @@ msgstr "Dilabeli oleh {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Dilabeli oleh pemosting." +msgstr "Dilabeli oleh pemosting.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Label" @@ -5307,17 +4958,9 @@ msgstr "Pelajari Lebih Lanjut" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Pelajari lebih lanjut tentang Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Pelajari lebih lanjut mengenai hosting mandiri PDS Anda." @@ -5352,15 +4995,10 @@ msgstr "Pelajari lebih lanjut tentang apa yang bersifat publik di Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Pelajari lebih lanjut." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Suka" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Suka ({0, plural, other {# suka}})" @@ -5491,13 +5125,9 @@ msgstr "Suka pada postingan ulang Anda" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Suka pada notifikasi postingan ulang Anda" +msgstr "Suka pada notifikasi postingan ulang Anda<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Suka pada postingan ini" @@ -5801,45 +5431,23 @@ msgstr "Opsi pesan" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Pesan" +msgstr "Pesan<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Tengah malam" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "Notifikasi lainnya" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Akun Menyesatkan" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Postingan yang Menyesatkan" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Alat moderasi" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderator telah memilih untuk menetapkan peringatan umum pada konten." +msgstr "Moderator telah memilih untuk menetapkan peringatan umum pada konten.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Feed lainnya" @@ -6049,18 +5652,8 @@ msgstr "Daftar Feed Saya" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nama" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nama atau Deskripsi Melanggar Standar Komunitas" - -======= ->>>>>>> upstream/main +msgstr "Nama<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "Tidak ada gambar" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Belum ada yang menyukai" +msgstr "Belum ada yang menyukai<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Tidak lagi mengikuti {0}" @@ -6285,7 +5873,7 @@ msgstr "Belum ada pesan" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Belum ada notifikasi!" @@ -6339,9 +5927,9 @@ msgstr "Tidak ditemukan hasil" msgid "No results found for \"{query}\"" msgstr "Tidak ditemukan hasil untuk \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Tidak ditemukan hasil untuk {query}" @@ -6476,15 +6064,8 @@ msgstr "Sekarang" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Ketelanjangan" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Ketelanjangan atau konten dewasa yang tidak dilabeli sedemikian rupa" +msgstr "Ketelanjangan<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Oke" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Buka menu geser" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Buka pemilih emoji" @@ -6710,7 +6287,7 @@ msgstr "Membuka penyusun postingan" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Membuka pemilih emoji" @@ -6750,15 +6327,10 @@ msgstr "Membuka formulir pengaturan ulang kata sandi" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Membuka profil ini" @@ -6792,12 +6364,7 @@ msgstr "Status OTA: Tidak ada yang tersedia" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Lainnya" @@ -6907,23 +6474,16 @@ msgstr "Orang yang mengikuti @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Izin untuk mengakses pustaka foto Anda ditolak. Silakan aktifkan di pengaturan sistem Anda." @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postingan" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Posting" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Posting Semua" @@ -7208,19 +6768,12 @@ msgstr "Postingan dihapus" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Postingan gagal diunggah. Silakan periksa koneksi internet Anda dan coba lagi." +msgstr "Postingan gagal diunggah. Silakan periksa koneksi internet Anda dan coba lagi.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Postingan telah dihapus" @@ -7356,7 +6909,7 @@ msgstr "Kebijakan Privasi" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Memproses video..." @@ -7384,19 +6937,12 @@ msgstr "Profil diperbarui" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Publik" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Daftar terbuka yang dapat dibagikan dan digunakan sebagai feed." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Kirim postingan" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Kirim postingan" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Kirim balasan" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Kirim balasan" @@ -7488,13 +7034,9 @@ msgstr "Kutipan dinonaktifkan" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Kutipan" +msgstr "Kutipan<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Kutipan postingan ini" @@ -7555,12 +7097,12 @@ msgstr "Baca Ketentuan Layanan Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Hapus sisipan" msgid "Remove Avatar" msgstr "Hapus Avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Hapus Sampul" @@ -7826,17 +7368,13 @@ msgstr "Balasan dinonaktifkan" msgid "Replies to this post are disabled." msgstr "Balasan ke postingan ini dinonaktifkan." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Balas" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Balas ({0, plural, other {# balasan}})" @@ -7997,13 +7535,9 @@ msgstr "Diposting ulang oleh Anda" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Postingan ulang postingan ini" @@ -8076,17 +7610,13 @@ msgstr "Reset status orientasi" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reset kata sandi" +msgstr "Reset kata sandi<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Mencoba masuk kembali" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Sains" +msgstr "Sains<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Cari \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Cari \"{searchText}\"" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Cari GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8630,19 +8157,12 @@ msgstr "Atur tanggal lahir" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Buat kata sandi baru" +msgstr "Buat kata sandi baru<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Siapkan akun Anda" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Tampilkan balasan" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Tampilkan balasan" +msgstr "Tampilkan balasan<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Tampilkan balasan untuk semua" @@ -8912,13 +8423,9 @@ msgstr "Tampilkan peringatan" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Tampilkan peringatan dan saring dari feed" +msgstr "Tampilkan peringatan dan saring dari feed<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Menampilkan informasi tentang kapan postingan ini dibuat" @@ -8939,7 +8446,7 @@ msgstr "Menampilkan konten" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Sumber: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; menyebut atau membalas secara berlebihan" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Disarankan untuk Anda" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestif" +msgstr "Sugestif<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Terbit" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Terbenam" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Ketentuan" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Ketentuan Layanan" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Istilah yang digunakan melanggar standar komunitas" - -======= ->>>>>>> upstream/main +msgstr "Ketentuan Layanan<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Teks & tagar" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Itu saja!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Akun ini dapat berinteraksi kembali dengan Anda setelah blokir dibuka." @@ -9648,17 +9115,12 @@ msgstr "Ada masalah saat menghubungi server" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Ada masalah saat menghubungi server, silakan periksa koneksi internet Anda dan coba lagi." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Ada masalah saat mengambil notifikasi. Ketuk di sini untuk mencoba lagi." +msgstr "Ada masalah saat mengambil notifikasi. Ketuk di sini untuk mencoba lagi.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Ada masalah saat mengambil postingan. Ketuk di sini untuk mencoba lagi." @@ -9697,16 +9159,9 @@ msgstr "Ada masalah saat memperbarui feed Anda, silakan periksa koneksi internet #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Ada masalah tak terduga dalam aplikasi. Beri tahu kami jika hal ini terj #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Terjadi lonjakan pengguna baru di Bluesky! Kami akan mengaktifkan akun Anda secepat mungkin." +msgstr "Terjadi lonjakan pengguna baru di Bluesky! Kami akan mengaktifkan akun Anda secepat mungkin.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Daftar ini kosong." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Layanan moderasi ini tidak tersedia. Lihat detail lebih lanjut di bawah. Jika masalah berlanjut, hubungi kami." +msgstr "Layanan moderasi ini tidak tersedia. Lihat detail lebih lanjut di bawah. Jika masalah berlanjut, hubungi kami.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Postingan ini mengklaim dibuat pada <0>{0}, tetapi baru terlihat di Bluesky pada <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Topik" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Terjemahkan" @@ -10205,22 +9644,13 @@ msgstr "Buka blokir" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Buka blokir akun" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Buka Blokir Akun?" @@ -10242,16 +9672,8 @@ msgstr "Batalkan posting ulang" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Batal posting ulang ({0, plural, other {# postingan ulang}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Berhenti ikuti" +msgstr "Batal posting ulang ({0, plural, other {# postingan ulang}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Berhenti ikuti {0}" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Batal suka" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Batal suka ({0, plural, other {# suka}})" @@ -10409,16 +9823,8 @@ msgstr "Telah berhenti berlangganan dari daftar" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Konten Seksual yang Tidak Diinginkan" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Unggah berkas teks ke:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Unggah dari Kamera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Unggah dari Berkas" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Unggah dari Pustaka" @@ -10494,7 +9900,7 @@ msgstr "Mengunggah gambar..." msgid "Uploading link thumbnail..." msgstr "Mengunggah keluku tautan..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Mengunggah video..." @@ -10748,7 +10154,7 @@ msgstr "Video tidak ditemukan." msgid "Video settings" msgstr "Pengaturan video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video diunggah" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Lihat avatar {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Lihat postingan blog untuk detail lebih lanjut" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Lihat entri debug" +msgstr "Lihat entri debug<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Lihat detail" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Lihat profil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Lihat avatar" @@ -10890,15 +10291,10 @@ msgstr "Lihat daftar akun yang Anda bisukan" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Lihat verifikasi Anda" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Lihat verifikasi Anda<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Melihat gambar penuh" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Maaf, kami tidak dapat memuat daftar ini. Jika masalah berlanjut, silaka msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Mohon maaf, untuk saat ini kami tidak dapat memuat kata yang Anda bisukan. Silakan coba lagi." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Maaf, pencarian Anda tidak dapat dilakukan. Mohon coba lagi dalam beberapa menit." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Mengapa pengguna ini perlu ditinjau?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/it/messages.po b/src/locale/locales/it/messages.po index 90f2686e4..7243945e7 100644 --- a/src/locale/locales/it/messages.po +++ b/src/locale/locales/it/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {follower} other {follower}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seguito} other {seguiti}}" +msgstr "{0, plural, one {seguito} other {seguiti}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {mi piace} other {mi piace}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {post} other {post}}" +msgstr "{0, plural, one {post} other {post}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citazione} other {citazioni}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repost} other {repost}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citazione} other {citazioni}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repost} other {repost}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {salvataggio} other {salvataggi}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {e altri #}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (account)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} alle {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Accedi<1> o <2>crea un account<3> <4>per cercare notizie, sport, politica e tutto quello che accade su Bluesky." @@ -587,11 +567,7 @@ msgstr "Risorse aggiuntive" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamento offensivo o discriminatorio" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Accessibilità" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Impostazioni di accessibilità" +msgstr "Impostazioni di accessibilità<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account" +msgstr "Account<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Account bloccato" @@ -669,26 +634,18 @@ msgstr "Account silenziato dalla lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opzioni dell'account" +msgstr "Opzioni dell'account<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Fornitore account" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Account rimosso dall'accesso rapido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Account sbloccato" @@ -778,7 +735,7 @@ msgstr "Aggiungi un altro account" msgid "Add another post" msgstr "Aggiungi un altro post" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Aggiungi un altro post al thread" @@ -889,20 +846,12 @@ msgstr "Esplicito" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenuto per adulti" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Contenuto per adulti" @@ -921,11 +870,7 @@ msgstr "Etichette per contenuti per adulti" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenuti di abuso sessuale su adulti" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Un'illustrazione che mostra che Bluesky seleziona certificatori attendibili e questi a loro volta verificano gli account dei singoli utenti." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Un problema non incluso in queste opzioni" @@ -1171,19 +1112,11 @@ msgstr "e" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Abuso sessuale su animali" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Benessere degli animali" ->>>>>>> upstream/main +msgstr "Benessere degli animali>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Annuncio" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Annuncio delle verifiche in Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamento antisociale" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Annuncio delle verifiche in Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Chiunque" ->>>>>>> upstream/main +msgstr "Chiunque>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "I nomi delle password per app devono essere lunghi almeno 4 caratteri" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Password per app" +msgstr "Password per app<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Password per app" @@ -1307,19 +1225,12 @@ msgstr "Revisione sospensione" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Fai ricorso contro questa decisione" +msgstr "Fai ricorso contro questa decisione<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aspetto" @@ -1331,23 +1242,14 @@ msgstr "Applica i feed consigliati predefiniti" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Applica pull request" +msgstr "Applica pull request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archiviato da {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archiviato da {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Post archiviato" @@ -1416,18 +1318,11 @@ msgstr "Assegna argomento per l'algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Almeno 8 caratteri" +msgstr "Almeno 8 caratteri<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponibile" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponibile" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Vai ai messaggi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Attività vietate o violazioni della sicurezza" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Ritorno utente bloccato" ->>>>>>> upstream/main +msgstr "Ritorno utente bloccato>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Inizia il processo di verifica dell'età compilando i campi sottostanti. #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Compleanno" +msgstr "Compleanno<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blocca" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blocca account" @@ -1579,15 +1446,8 @@ msgstr "Blocca gli account" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocca ed elimina" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blocca e/o elimina questa conversazione" +msgstr "Blocca ed elimina<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Lista di account bloccati" @@ -1607,18 +1467,14 @@ msgstr "Blocca utente" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocca utente" +msgstr "Blocca utente<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Blocca e/o elimina questa conversazione" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloccato" @@ -1650,40 +1506,18 @@ msgstr "Il blocco è pubblico. Gli account bloccati non possono rispondere alle #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Il blocco non impedirà l'applicazione delle etichette al tuo account, ma impedirà a questo account di rispondere alle tue discussioni o di interagire con te." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky non può confermare l'autenticità della data dichiarata." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Il blocco non impedirà l'applicazione delle etichette al tuo account, ma impedirà a questo account di rispondere alle tue discussioni o di interagire con te.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky non può confermare l'autenticità della data dichiarata." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky è una rete aperta dove puoi scegliere il fornitore che ospita i tuoi dati. Se sei uno sviluppatore, puoi utilizzare il tuo server." @@ -1735,15 +1569,9 @@ msgstr "Libri" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Violazione regole del sito" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Scopri altri account nella pagina Esplora" @@ -1854,19 +1682,13 @@ msgstr "Fotocamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Annulla la riattivazione e disconnettiti" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annulla la ricerca" +msgstr "Annulla la ricerca<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Non puoi interagire con un utente bloccato" @@ -1955,11 +1771,7 @@ msgstr "Finestra di modifica password" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Cambia categoria segnalazione" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Richieste di messaggi" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Controlla la tua posta in arrivo, dovrebbe contenere un'email con il cod #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" msgstr "" -======= -msgstr "Sicurezza dei minori" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Materiale pedopornografico" ->>>>>>> upstream/main +msgstr "Materiale pedopornografico>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clop 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Chiudi finestra di benvenuto" msgid "Closes password update alert" msgstr "Chiude l'avviso di aggiornamento della password" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Annulla la creazione del post ed elimina la bozza" @@ -2350,7 +2142,7 @@ msgstr "Scrivi post fino a {0, plural, other {# caratteri}}" msgid "Compose reply" msgstr "Scrivi la risposta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Compressione del video..." @@ -2472,11 +2264,7 @@ msgstr "Contenuto non disponibile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenuti che promuovono o raffigurano autolesionismo" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copia DID dell'autore" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copia codice" +msgstr "Copia codice<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copia DID" @@ -2756,7 +2538,7 @@ msgstr "Crea un account" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Crea un account" @@ -2817,35 +2599,16 @@ msgstr "Personalizzato" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opzioni di personalizzazione" +msgstr "Opzioni di personalizzazione<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalizza chi può interagire con questo post." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personalizza la tua esperienza su Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Sfide o attività pericolose" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Abuso di sostanze o droghe pericolose" @@ -2854,7 +2617,6 @@ msgstr "Abuso di sostanze o droghe pericolose" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Scuro" @@ -2891,19 +2653,13 @@ msgstr "Pannello per il debug" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Contenuti per adulti deepfake" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Predefinito" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Icone predefinite" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Disattiva 2FA via email" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Disattiva il feedback tattile" +msgstr "Disattiva il feedback tattile<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Disabilita tutte le risposte>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Disabilita tutte le risposte" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Scopri nuovi feed" msgid "Dismiss" msgstr "Ignora" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Ignora errore" @@ -3271,11 +3014,8 @@ msgstr "Non preoccuparti! Tutti i messaggi e le impostazioni esistenti sono stat #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Scarica Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Scarica il file CAR" +msgstr "Scarica il file CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Diffusione di dati personali" ->>>>>>> upstream/main +msgstr "Diffusione di dati personali>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "es. Utenti che rispondono ripetutamente con annunci." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Disturbi alimentari" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Modifica" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Modifica avatar" @@ -3693,7 +3423,7 @@ msgstr "Passa a schermo intero" msgid "Entertainment" msgstr "Intrattenimento" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Errore" @@ -3714,11 +3444,11 @@ msgstr "Messaggio d'errore" msgid "Error occurred while saving file" msgstr "C'è stato un errore durante il salvataggio del file" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Errore nella risposta del captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Errore: {error}" @@ -3740,19 +3470,8 @@ msgstr "Tutti" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tutto il resto" +msgstr "Tutto il resto<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menzioni o risposte eccessive" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Messaggi eccessivi o indesiderati" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Escludi utenti che segui" @@ -3876,11 +3595,7 @@ msgstr "Preferenze media esterni" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Contenuti estremisti" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Non è stato possibile verificare il nome utente. Riprovare." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "Account falso o bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "False informazioni sulle elezioni" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feed" @@ -4241,26 +3946,8 @@ msgstr "Finalizza" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Nero" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Blu" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Bianco" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flessibile" @@ -4271,16 +3958,7 @@ msgstr "Flessibile" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Segui" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Segui" @@ -4323,16 +4001,8 @@ msgstr "Segui tutti gli account" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Ricambia follow" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Ricambia follow" @@ -4372,13 +4042,9 @@ msgstr "Follower che conosci" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seguito" @@ -4386,16 +4052,11 @@ msgstr "Seguito" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguito" +msgstr "Seguito<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Stai seguendo {0}" @@ -4482,15 +4143,8 @@ msgstr "Password dimenticata?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libera il tuo feed" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Pubblica spesso contenuti indesiderati" +msgstr "Libera il tuo feed<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Da" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dai un volto al tuo profilo" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Evidenti violazioni della legge o dei termini di servizio" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorificazione della violenza" ->>>>>>> upstream/main +msgstr "Dai un volto al tuo profilo<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Contenuto sensibile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Contenuti violenti espliciti" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Adescamento o comportamento predatorio" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking o attacchi di sistema" ->>>>>>> upstream/main +msgstr "Hacking o attacchi di sistema>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Vibrazione" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Molestie, trolling o intolleranza" -======= -msgstr "Molestie o odio" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Attività nocive o a rischio elevato" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Danni o pericoli per i minori" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Incitamento all'odio" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Hai un codice? <0>Fai clic qui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ci sono problemi?" +msgstr "Ci sono problemi?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Nascondi opzioni di personalizzazione" +msgstr "Nascondi opzioni di personalizzazione<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Nascondi liste" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Nascondi post per me" @@ -5015,11 +4613,7 @@ msgstr "Come dovremmo aprire questo link?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tratta di esseri umani" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Se sei uno sviluppatore, puoi utilizzare il tuo server." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Se stai cercando di cambiare nome utente o email, puoi farlo prima di disattivare l'account." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegale e urgente" +msgstr "Se stai cercando di cambiare nome utente o email, puoi farlo prima di disattivare l'account.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Immagine" @@ -5113,29 +4699,15 @@ msgstr "Immagine salvata" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Per salvare le immagini è necessario concedere l'accesso alla tua libreria foto." +msgstr "Per salvare le immagini è necessario concedere l'accesso alla tua libreria foto.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Furto d'identità o false affermazioni sull'identità o sull'affiliazione" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Impersonificazione, disinformazione, o affermazioni false" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Impersonificazione" ->>>>>>> upstream/main +msgstr "Impersonificazione>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Nell'app, Push, Tutti" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Nell'app, Push, Persone che segui" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Messaggi inappropriati o link espliciti" +msgstr "Nell'app, Push, Persone che segui<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Inserisci la password per l'eliminazione dell'account" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Inserisci il codice che ti è stato inviato via email" +msgstr "Inserisci il codice che ti è stato inviato via email<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interazione limitata" @@ -5287,7 +4844,7 @@ msgstr "C'è solo <0>{0} al momento! Aggiungi altre persone al tuo starter p msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Sei solo tu al momento! Aggiungi altre persone al tuo starter pack cercandole qui in alto." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID processo: {0}" @@ -5330,17 +4887,13 @@ msgstr "Etichettato da {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etichettato dall'autore." +msgstr "Etichettato dall'autore.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etichette" @@ -5405,17 +4958,9 @@ msgstr "Ulteriori Informazioni" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Scopri di più sulla verifica dell'età" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Scopri di più su Bluesky" +msgstr "Scopri di più sulla verifica dell'età<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Maggiori informazioni su come ospitare il tuo server." @@ -5450,15 +4995,10 @@ msgstr "Scopri cosa è pubblico su Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Scopri di più nelle <0>impostazioni dell'account." +msgstr "Scopri di più nelle <0>impostazioni dell'account.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Saperne di più." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Mi piace" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Mi piace ({0, plural, one {# mi piace} other {# mi piace}})" @@ -5589,13 +5125,9 @@ msgstr "Mi piace dei tuoi repost" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifiche dei mi piace dei tuoi repost" +msgstr "Notifiche dei mi piace dei tuoi repost<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Mi piace in questo post" @@ -5899,49 +5431,24 @@ msgstr "Opzioni messaggio" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messaggi" +msgstr "Messaggi<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Mezzanotte" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Molestie sui minori o bullismo" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notifiche varie" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Account ingannevole" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Post ingannevole" -======= -msgstr "Ingannevole" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Strumenti di moderazione" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Il moderatore ha messo un avviso generale sul contenuto." +msgstr "Il moderatore ha messo un avviso generale sul contenuto.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Altri feed" @@ -6150,18 +5652,8 @@ msgstr "I miei feed" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Il nome o la descrizione viola gli Standard della comunità" - -======= ->>>>>>> upstream/main +msgstr "Nome<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Nessuna immagine" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ancora nessun mi piace" +msgstr "Ancora nessun mi piace<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Non segui più {0}" @@ -6386,7 +5873,7 @@ msgstr "Ancora nessun messaggio" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Niente più notizie deprimenti e algoritmi spazzatura. Scopri feed pensati per te, non contro di te." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ancora nessuna notifica!" @@ -6440,9 +5927,9 @@ msgstr "Nessun risultato trovato" msgid "No results found for \"{query}\"" msgstr "Nessun risultato trovato per \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Nessun risultato trovato per {query}" @@ -6482,11 +5969,7 @@ msgstr "Nessun utente trovato. Prova a cercarne altri." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Immagini intime non consensuali" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Adesso" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudità" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudità o contenuti per adulti non etichettati come tali" +msgstr "Nudità<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Va bene" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Apri il menu a scomparsa" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Apri il selettore emoji" @@ -6815,7 +6287,7 @@ msgstr "Apre il compositore" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Apre la galleria del dispositivo per selezionare fino a {MAX_IMAGES, plural, other {# immagini}} o un singolo video o GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Apre il selettore emoji" @@ -6855,15 +6327,10 @@ msgstr "Apre il modulo di reimpostazione della password" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Apre le impostazioni sulla lingua dei post" +msgstr "Apre le impostazioni sulla lingua dei post<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Apre questo profilo" @@ -6897,12 +6364,7 @@ msgstr "Stato OTA: non disponibile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Altro" @@ -6912,35 +6374,8 @@ msgstr "Altro account" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Altri problemi di sicurezza per i bambini" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Altri contenuti pericolosi" @@ -6963,8 +6398,7 @@ msgstr "Altri contenuti di violenza sessuale" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Altri contenuti violenti" ->>>>>>> upstream/main +msgstr "Altri contenuti violenti>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Persone che seguono @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Persone che seguo" +msgstr "Persone che seguo<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Persone che segui" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Persone che menzioni" +msgstr "Persone che menzioni>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "L'accesso alla tua libreria foto è stato negato. Abilitalo nelle impostazioni di sistema." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Post" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Posta tutti" @@ -7341,19 +6768,12 @@ msgstr "Post eliminato" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Non è stato possibile inviare il post. Verifica la tua connessione a internet e riprova." +msgstr "Non è stato possibile inviare il post. Verifica la tua connessione a internet e riprova.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Il post è stato eliminato" @@ -7487,13 +6907,9 @@ msgstr "Informativa sulla privacy" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Violazione della privacy di un minore" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Elaborazione video in corso..." @@ -7521,15 +6937,11 @@ msgstr "Profilo aggiornato" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promozione o vendita di articoli o servizi vietati" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Puoi modificare chi può interagire con questo post." ->>>>>>> upstream/main +msgstr "Puoi modificare chi può interagire con questo post.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Liste pubbliche e condivisibili che danno impulso ai feed." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Pubblica post" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Pubblica i post" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Pubblica risposte" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Pubblica risposta" @@ -7622,13 +7034,9 @@ msgstr "Citazioni disattivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citazioni" +msgstr "Citazioni<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citazioni post" @@ -7689,12 +7097,12 @@ msgstr "Leggi i termini di servizio di Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Rimuovi allegato" msgid "Remove Avatar" msgstr "Rimuovi avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Rimuovi banner" @@ -7960,17 +7368,13 @@ msgstr "Risposte disattivate" msgid "Replies to this post are disabled." msgstr "Le risposte a questo post sono disattivate." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Rispondi" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Rispondi ({0, plural, one {# risposta} other {# risposte}})" @@ -8060,11 +7464,7 @@ msgstr "Segnalazione inviata" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Segnala questa conversazione" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Ripubblicato da te" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repost" +msgstr "Repost<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Ripubblicazioni di questo post" @@ -8214,17 +7610,13 @@ msgstr "Ripristina lo stato di registrazione" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reimposta la password" +msgstr "Reimposta la password<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Ritenta l'accesso" @@ -8377,28 +7769,21 @@ msgstr "Di' ciao!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Truffa" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scienza" +msgstr "Scienza<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Scorri a sinistra" @@ -8443,11 +7828,11 @@ msgstr "Cerca \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Cerca \"{interestsDisplayName}\" (attivo)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Cerca \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Cerca \"{searchText}\"" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Cerca GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "La ricerca non è disponibile per gli utenti che non hanno effettuato l'accesso" @@ -8565,11 +7950,7 @@ msgstr "Scegli un colore" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Seleziona un motivo" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "La selezione di più tipi di media non è supportata." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamenti autolesionistici o pericolosi" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Imposta la data di nascita" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Imposta una nuova password" +msgstr "Imposta una nuova password<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Imposta con precisione quali gruppi di persone possono rispondere al tuo post" +msgstr "Imposta con precisione quali gruppi di persone possono rispondere al tuo post>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configura il tuo account" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Mostra risposte" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostra risposte come" +msgstr "Mostra risposte come<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostra risposta per tutti" @@ -9062,13 +8423,9 @@ msgstr "Mostra avviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostra avviso e filtra dai feed" +msgstr "Mostra avviso e filtra dai feed<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Mostra informazioni sulla data di creazione del post" @@ -9089,7 +8446,7 @@ msgstr "Mostra il contenuto" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Fonte: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam, menzioni o risposte eccessive" -======= -msgstr "Spam o altri comportamenti non autentici o ingannevoli" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Suggerito per te" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestivo" +msgstr "Suggestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Alba" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Tramonto" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Tocca per ignorare" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Molestie mirate" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Termini" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termini di servizio" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "I termini usati violano gli standard della comunità" - -======= ->>>>>>> upstream/main +msgstr "Termini di servizio<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Testo e tag" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "È tutto!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "L'account sarà in grado di interagire con te dopo lo sblocco." @@ -9803,17 +9115,12 @@ msgstr "Si è verificato un problema durante il contatto con il server" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Si è verificato un problema contattando il server, verifica la tua connessione a internet e riprova." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Si è verificato un problema durante il recupero delle notifiche. Tocca qui per riprovare." +msgstr "Si è verificato un problema durante il recupero delle notifiche. Tocca qui per riprovare.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Si è verificato un problema nel recupero dei post. Tocca qui per riprovare." @@ -9852,16 +9159,9 @@ msgstr "Si è verificato un problema durante l'aggiornamento dei tuoi feed. Veri #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Si è verificato un problema imprevisto nell'applicazione. Facci sapere #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "C'è stata un'ondata di nuovi utenti su Bluesky! Attiveremo il tuo account il prima possibile." +msgstr "C'è stata un'ondata di nuovi utenti su Bluesky! Attiveremo il tuo account il prima possibile.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Queste sono le tue impostazioni predefinite" ->>>>>>> upstream/main +msgstr "Queste sono le tue impostazioni predefinite>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Questa lista è vuota." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Questo servizio di moderazione non è disponibile. Vedi giù per ulteriori dettagli. Se il problema persiste, contattaci." +msgstr "Questo servizio di moderazione non è disponibile. Vedi giù per ulteriori dettagli. Se il problema persiste, contattaci.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Questo post dichiara di essere stato creato il <0>{0}, ma è stato visto per la prima volta da Bluesky il <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Preferenze per le discussioni" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Minacce o incitamento" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Argomento" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traduci" @@ -10262,11 +9541,7 @@ msgstr "Video di tendenza" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamento provocatorio / trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Sblocca" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Sblocca account" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Sblocca account?" @@ -10406,16 +9672,8 @@ msgstr "Annulla repost" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Annulla repost ({0, plural, one {# repost} other {# repost}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Smetti di seguire" +msgstr "Annulla repost ({0, plural, one {# repost} other {# repost}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Smetti di seguire {0}" @@ -10443,32 +9701,18 @@ msgstr "Certificatore sconosciuto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Altro contenuto per adulti" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Altro contenuto per adulti, offensivo o non consensuale" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Non mi piace più" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Non mi piace più ({0, plural, one {# mi piace} other {# mi piace}})" @@ -10579,16 +9823,8 @@ msgstr "Disiscritto dalla lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tipo di video non supportato: {mimeType}" +msgstr "Tipo di video non supportato: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Contenuti sessuali indesiderati" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Carica un file di testo su:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Carica dalla fotocamera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Carica dai file" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Carica dalla galleria" @@ -10664,7 +9900,7 @@ msgstr "Caricamento immagini..." msgid "Uploading link thumbnail..." msgstr "Caricamento miniatura del link..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Caricamento del video..." @@ -10918,7 +10154,7 @@ msgstr "Video non trovato." msgid "Video settings" msgstr "Impostazioni video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video caricato" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Vedi" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Vedi l'avatar di {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Vedi il post del blog per maggiori dettagli" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vedi le informazioni del debug" +msgstr "Vedi le informazioni del debug<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Vedi dettagli" @@ -11013,10 +10248,6 @@ msgstr "Vedi post" msgid "View profile" msgstr "Vedi il profilo" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Vedi l'avatar" @@ -11060,15 +10291,10 @@ msgstr "Vedi i tuoi account silenziati" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vedi le tue verifiche" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Vedi le tue verifiche<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Vedi l'immagine completa" @@ -11078,24 +10304,16 @@ msgstr "Mostra video in modalità immersiva" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Contenuto violento o minaccioso>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violenza" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Contenuto violento o minaccioso" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Siamo spiacenti, ma non siamo riusciti a risolvere questa lista. Se il p msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Non è stato possibile caricare le parole silenziate. Riprova." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Siamo spiacenti, ma non è stato possibile completare la ricerca. Riprova tra qualche minuto." @@ -11346,11 +10564,7 @@ msgstr "Per quale motivo fai ricorso?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Perché questa conversazione dovrebbe essere esaminata?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Perché questo utente dovrebbe essere esaminato?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Vuoi bloccare questo utente e/o eliminare questa conversazione?" ->>>>>>> upstream/main +msgstr "Vuoi bloccare questo utente e/o eliminare questa conversazione?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Hai effettuato l'accesso con una password per app. Accedi con la tua pas #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Hai già inviato una richiesta di revisione per questa etichetta e il nostro team di moderazione la sta valutando." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po index 437484855..579e80b5e 100644 --- a/src/locale/locales/ja/messages.po +++ b/src/locale/locales/ja/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, other {フォロワー}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, other {フォロー中}}" +msgstr "{0, plural, other {フォロー中}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {いいね}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {投稿}}" +msgstr "{0, plural, other {投稿}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {引用}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {リポスト}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {引用}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {リポスト}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, other {保存}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+#}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0}（アカウント）" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<4>ニュース、スポーツ、政治、ほか、Bluesky上で起こっているその他すべてのことを検索するためには<0>サインイン<1>するか<2>アカウントを作成<3>してください。" @@ -587,11 +567,7 @@ msgstr "このアプリについて" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "虐待または差別的な行動" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "アクセシビリティ" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "アクセシビリティの設定" +msgstr "アクセシビリティの設定<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "アカウント" +msgstr "アカウント<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "アカウントをブロックしました" @@ -669,26 +634,18 @@ msgstr "リストによってミュート中のアカウント" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "アカウントオプション" +msgstr "アカウントオプション<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "アカウントプロバイダー" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "クイックアクセスからアカウントを解除" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "アカウントのブロックを解除しました" @@ -778,7 +735,7 @@ msgstr "他のアカウントを追加" msgid "Add another post" msgstr "他の投稿を追加" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "スレッドに他の投稿を追加" @@ -889,20 +846,12 @@ msgstr "成人向け（ポルノ等）" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人向けコンテンツ" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "成人向けコンテンツ" @@ -921,11 +870,7 @@ msgstr "成人向けコンテンツのラベル" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人向けの性的虐待コンテンツ" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Blueskyが信頼された認証者を選択し、信頼された認証者が個々のユーザアカウントを認証することを示す図。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "ほかの選択肢にはあてはまらない問題" @@ -1171,19 +1112,11 @@ msgstr "および" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "動物の性的虐待" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "動物の福祉" ->>>>>>> upstream/main +msgstr "動物の福祉>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "お知らせ" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Blueskyでの認証のお知らせ" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "反社会的な行動" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Blueskyでの認証のお知らせ<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "誰でも" ->>>>>>> upstream/main +msgstr "誰でも>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "アプリパスワードの名前は長さが4文字以上である必 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "アプリパスワード" +msgstr "アプリパスワード<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "アプリパスワード" @@ -1307,19 +1225,12 @@ msgstr "アカウント停止に異議申し立て" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "この決定に異議を申し立てる" +msgstr "この決定に異議を申し立てる<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "外観" @@ -1331,23 +1242,14 @@ msgstr "デフォルトのおすすめフィードを追加" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "プルリクエストを適用" +msgstr "プルリクエストを適用<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0}のアーカイブ" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0}のアーカイブ" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "アーカイブ投稿" @@ -1416,18 +1318,11 @@ msgstr "アルゴリズム用にトピックを割り当て" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "少なくとも8文字" +msgstr "少なくとも8文字<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "オーロラ" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "利用可能" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "利用可能" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "チャットへ戻る" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "禁止されたアクティビティまたはセキュリティ侵害" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "BANされたユーザーの帰還" ->>>>>>> upstream/main +msgstr "BANされたユーザーの帰還>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "年齢保証プロセスを開始するには、以下のフィールド #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生年月日" +msgstr "生年月日<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "ブロック" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "アカウントをブロック" @@ -1579,15 +1446,8 @@ msgstr "アカウントをブロック" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "ブロックと削除" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "この会話をブロックして削除（あるいはどちらか）" +msgstr "ブロックと削除<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "リストをブロック" @@ -1607,18 +1467,14 @@ msgstr "ユーザーをブロック" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "ユーザーをブロック" +msgstr "ユーザーをブロック<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "ユーザーをブロックするかこの会話を削除（あるいは両方）" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "ブロックされています" @@ -1650,40 +1506,18 @@ msgstr "ブロックしたことは公開されます。ブロック中のアカ #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "ブロックしてもこのラベラーがあなたのアカウントにラベルを適用することができますが、このアカウントがあなたのスレッドに返信したり、やりとりをしたりといったことはできなくなります。" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Blueskyでは、この投稿日時の信憑性を確認できません。" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "ブログ" +msgstr "ブロックしてもこのラベラーがあなたのアカウントにラベルを適用することができますが、このアカウントがあなたのスレッドに返信したり、やりとりをしたりといったことはできなくなります。<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Blueskyでは、この投稿日時の信憑性を確認できません。" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky は、ホスティング プロバイダーを選択できるオープン ネットワークです。 あなたが開発者であれば、自分のサーバーをホストできます。" @@ -1735,15 +1569,9 @@ msgstr "書籍" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "サイト規約違反" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "検索ページでさらにアカウントを見る" @@ -1854,19 +1682,13 @@ msgstr "カメラ" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "再有効化をキャンセルしてサインアウト" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "検索をキャンセル" +msgstr "検索をキャンセル<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "ブロックしたユーザーとはやりとりできません" @@ -1955,11 +1771,7 @@ msgstr "パスワード変更ダイアログ" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "レポートカテゴリの変更" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "チャットの要求" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "入力したメールアドレスの受信トレイを確認して、以 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "児童の安全" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "児童性的虐待コンテンツ（CSAM）" ->>>>>>> upstream/main +msgstr "児童性的虐待コンテンツ（CSAM）>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "パカラッ 🐴 パカラッ 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "ウェルカムモーダルを閉じる" msgid "Closes password update alert" msgstr "パスワード更新アラートを閉じる" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "投稿の編集画面を閉じて下書きを破棄" @@ -2350,7 +2142,7 @@ msgstr "最大{0, plural, other {#文字}}まで投稿を編集" msgid "Compose reply" msgstr "返信を作成" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "ビデオを圧縮中…" @@ -2472,11 +2264,7 @@ msgstr "コンテンツはありません" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "自傷行為を助長または描写するコンテンツ" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "投稿者のDIDをコピー" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "コードをコピー" +msgstr "コードをコピー<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DIDをコピー" @@ -2756,7 +2538,7 @@ msgstr "アカウントを作成" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "アカウントを作成" @@ -2817,35 +2599,16 @@ msgstr "カスタム" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "カスタマイズオプション" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "この投稿に誰が反応できるかカスタマイズする。" +msgstr "カスタマイズオプション<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Blueskyでの体験をカスタマイズ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "危険なチャレンジまたは活動" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "危険物質または薬物の乱用" @@ -2854,7 +2617,6 @@ msgstr "危険物質または薬物の乱用" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "ダーク" @@ -2891,19 +2653,13 @@ msgstr "デバッグパネル" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "ディープフェイクによる成人向けコンテンツ" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "デフォルト" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "デフォルトアイコン" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "メールでの2要素認証を無効にする" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "触覚フィードバックを無効化" +msgstr "触覚フィードバックを無効化<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "返信を完全に無効にする>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "返信を完全に無効にする" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "新しいフィードを探す" msgid "Dismiss" msgstr "消す" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "エラーを消す" @@ -3271,11 +3014,8 @@ msgstr "心配しないでください！すべての既存のメッセージと #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Blueskyをダウンロード" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CARファイルをダウンロード" +msgstr "CARファイルをダウンロード<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "ドクシング（個人情報晒し）" ->>>>>>> upstream/main +msgstr "ドクシング（個人情報晒し）>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "例: 繰り返し広告付きで返信するユーザー。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "摂食障害" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "編集" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "アバターを編集" @@ -3693,7 +3423,7 @@ msgstr "フルスクリーンで表示" msgid "Entertainment" msgstr "エンターテインメント" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "エラー" @@ -3714,11 +3444,11 @@ msgstr "エラーメッセージ" msgid "Error occurred while saving file" msgstr "ファイルの保存中にエラーが発生しました" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "CAPTCHAレスポンスの受信中にエラーが発生しました。" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "エラー：{error}" @@ -3740,19 +3470,8 @@ msgstr "全員" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "他すべて" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "過剰なメンションや返信" +msgstr "他すべて<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "多すぎる、または不要なメッセージ" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "フォローしているユーザーは除外" @@ -3876,11 +3595,7 @@ msgstr "外部メディアの設定" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "過激主義的コンテンツ" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "ハンドルの変更に失敗しました。もう一度試してくだ #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "偽のアカウントまたはボット" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "選挙に関する誤った情報" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "フィード" @@ -4241,26 +3946,8 @@ msgstr "完了" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "フィットネス" +msgstr "フィットネス<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "フラット ブラック" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "フラット ブルー" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "フラット ホワイト" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "柔軟です" @@ -4271,16 +3958,7 @@ msgstr "柔軟です" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "フォロー" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "フォロー" @@ -4323,16 +4001,8 @@ msgstr "すべてのアカウントをフォロー" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "フォローバック" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "フォローバック" @@ -4372,13 +4042,9 @@ msgstr "あなたが知っているフォロワー" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "フォロー中" @@ -4386,16 +4052,11 @@ msgstr "フォロー中" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "フォロー中" +msgstr "フォロー中<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0}をフォローしました" @@ -4482,15 +4143,8 @@ msgstr "忘れた？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "フィードを解放しよう" +msgstr "フィードを解放しよう<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "望ましくないコンテンツを頻繁に投稿" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "通知対象" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "プロフィールに顔をつける" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "法律または利用規約への明らかな違反" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "暴力の賛美" ->>>>>>> upstream/main +msgstr "プロフィールに顔をつける<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,18 +4356,7 @@ msgstr "生々しいメディア（グロ・事故・戦争・災害等）" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "露骨な暴力的コンテンツ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4731,8 +4364,7 @@ msgstr "グルーミングまたは捕食的行為（性的搾取目的の接近 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "ハッキングまたはシステム攻撃" ->>>>>>> upstream/main +msgstr "ハッキングまたはシステム攻撃>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "触覚フィードバック" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "嫌がらせ、荒らし、不寛容" -======= -msgstr "嫌がらせまたはヘイト" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "有害または高リスクの活動" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "未成年者への危害または危険行為" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "ハッシュタグ {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "ヘイトスピーチ" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "コードがありませんか？<0>ここをクリックしてくださ #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "なにか問題が発生しましたか？" +msgstr "なにか問題が発生しましたか？<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "カスタマイズオプションを非表示" +msgstr "カスタマイズオプションを非表示<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "リストを非表示にする" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "投稿を自分には非表示" @@ -5015,11 +4613,7 @@ msgstr "このリンクをどのように開きますか？" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "人身売買" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "あなたが開発者ならば、自分でサーバーをホストでき #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "ハンドルやメールアドレスを変えるのであれば、無効化の前に変更してください。" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "違法かつ緊急" +msgstr "ハンドルやメールアドレスを変えるのであれば、無効化の前に変更してください。<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "画像" @@ -5113,29 +4699,15 @@ msgstr "画像を保存しました" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "写真ライブラリへのアクセスが許可されない限り、画像を保存できません。" +msgstr "写真ライブラリへのアクセスが許可されない限り、画像を保存できません。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "なりすまし、または身元もしくは所属に関する虚偽の主張" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "なりすまし、偽情報、あるいは虚偽の主張" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "なりすまし" ->>>>>>> upstream/main +msgstr "なりすまし>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "アプリ内、プッシュ、全員" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "アプリ内、プッシュ、フォロー中の人" +msgstr "アプリ内、プッシュ、フォロー中の人<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "不適切なメッセージ、または露骨なコンテンツへのリンク" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "アカウント削除のためにパスワードを入力" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "メールで送られたコードを入力" +msgstr "メールで送られたコードを入力<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "反応が制限されています" @@ -5287,7 +4844,7 @@ msgstr "ちょうど今<0>{0} です！上記で検索して多くの人々 msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "今はあなただけ！上で検索してスターターパックにより多くのユーザーを追加してください。" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ジョブID：{0}" @@ -5330,17 +4887,13 @@ msgstr "{0}によるラベル" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "投稿者によるラベル。" +msgstr "投稿者によるラベル。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "ラベル" @@ -5405,17 +4958,9 @@ msgstr "詳細" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "年齢保証について詳しく知る" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Blueskyについての詳細" +msgstr "年齢保証について詳しく知る<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "自分用のPDSをホスティングする方法を学ぶ。" @@ -5450,15 +4995,10 @@ msgstr "Blueskyで公開されている内容はこちらを参照してくだ #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<0>アカウント設定で詳細を確認する。" +msgstr "<0>アカウント設定で詳細を確認する。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "詳細。" @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "いいねする" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "いいねする（{0, plural, other {#件のいいね}}）" @@ -5589,13 +5125,9 @@ msgstr "リポストへのいいね" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "リポストへのいいねの通知" +msgstr "リポストへのいいねの通知<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "この投稿をいいねする" @@ -5899,49 +5431,24 @@ msgstr "メッセージのオプション" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "メッセージ" +msgstr "メッセージ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "ミッドナイト" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "未成年者への嫌がらせまたはいじめ" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "その他の通知" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "誤解を招くアカウント" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "誤解を招く投稿" -======= -msgstr "誤解を招くこと" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "モデレーションのツール" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "モデレーターによりコンテンツに一般的な警告が設定されました。" +msgstr "モデレーターによりコンテンツに一般的な警告が設定されました。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "その他のフィード" @@ -6150,18 +5652,8 @@ msgstr "マイフィード" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名前" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "名前または説明がコミュニティ基準に違反" - -======= ->>>>>>> upstream/main +msgstr "名前<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "画像なし" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "いいねはありません" +msgstr "いいねはありません<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0}のフォローを解除しました" @@ -6386,7 +5873,7 @@ msgstr "メッセージはありません" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "延々と流れてくる嫌なものから目が離せなくなるドゥームスクロールを生むノイズまみれのアルゴリズムは、もういらない。あなたの味方をするフィードを見つけよう。" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "お知らせはありません！" @@ -6440,9 +5927,9 @@ msgstr "結果は見つかりません" msgid "No results found for \"{query}\"" msgstr "「{query}」の検索結果はありません" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "「{query}」の検索結果はありません" @@ -6482,11 +5969,7 @@ msgstr "誰も見つかりませんでした。他を探してみて。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "同意のない親密画像（NCII）" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "今" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "ヌード" +msgstr "ヌード<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "ヌードあるいは成人向けコンテンツと表示されていないもの" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "OK" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "引き出しメニューを開く" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "絵文字を入力" @@ -6815,7 +6287,7 @@ msgstr "編集画面を開く" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "デバイスのギャラリーを開いて最大{MAX_IMAGES, plural, other {#枚の画像}}、あるいは動画またはGIFを1つを選択します。" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "絵文字選択を開く" @@ -6855,15 +6327,10 @@ msgstr "パスワードリセットのフォームを開く" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "投稿言語の設定を開く" +msgstr "投稿言語の設定を開く<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "プロフィールを開く" @@ -6897,12 +6364,7 @@ msgstr "OTA ステータス：利用可能なものはありません" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "その他" @@ -6912,35 +6374,8 @@ msgstr "その他のアカウント" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "その他の児童の安全に関する問題" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "その他の危険なコンテンツ" @@ -6963,8 +6398,7 @@ msgstr "その他の性的暴力に関するコンテンツ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "その他の暴力的コンテンツ" ->>>>>>> upstream/main +msgstr "その他の暴力的コンテンツ>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "@{0}をフォロー中のユーザー" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "フォロー中の人" +msgstr "フォロー中の人<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "フォロー中の人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "メンションした人" +msgstr "メンションした人>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "写真ライブラリへのアクセスが拒否されました。システム設定で有効にしてください。" @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "投稿" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "投稿" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "すべてポスト" @@ -7341,19 +6768,12 @@ msgstr "投稿を削除しました" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "投稿のアップロードに失敗しました。インターネット接続を確認し、再度試してください。" +msgstr "投稿のアップロードに失敗しました。インターネット接続を確認し、再度試してください。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "投稿は削除されました" @@ -7487,13 +6907,9 @@ msgstr "プライバシーポリシー" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "未成年者のプライバシー侵害" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "ビデオを処理中…" @@ -7521,15 +6937,11 @@ msgstr "プロフィールを更新しました" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "禁止品目・サービスの宣伝または販売" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "ちょっと！この投稿に誰が反応できるか、編集できますよ。" ->>>>>>> upstream/main +msgstr "ちょっと！この投稿に誰が反応できるか、編集できますよ。>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "フィードとして見ることに使える、公開された共有可能なリスト" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "投稿を公開" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "投稿を公開" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "返信を公開" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "返信を公開" @@ -7622,13 +7034,9 @@ msgstr "引用投稿は無効です" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用" +msgstr "引用<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "この投稿を引用する" @@ -7689,12 +7097,12 @@ msgstr "Blueskyの利用規約を読む" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "添付を削除" msgid "Remove Avatar" msgstr "アバターを削除" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "バナーを削除" @@ -7960,17 +7368,13 @@ msgstr "返信できません" msgid "Replies to this post are disabled." msgstr "この投稿への返信は無効化されています。" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "返信" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "返信する（{0, plural, other {#件の返信}}）" @@ -8060,11 +7464,7 @@ msgstr "報告を送信しました" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "この会話を報告" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "あなたのリポスト" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "リポスト" +msgstr "リポスト<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "この投稿をリポストする" @@ -8214,17 +7610,13 @@ msgstr "オンボーディングの状態をリセット" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "パスワードをリセット" +msgstr "パスワードをリセット<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "サインインを再試行" @@ -8377,28 +7769,21 @@ msgstr "よろしく！" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "詐欺" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科学" +msgstr "科学<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "左にスクロール" @@ -8443,11 +7828,11 @@ msgstr "「{interestsDisplayName}」を検索" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "\"{interestsDisplayName}\" を検索 (アクティブ)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "「{query}」を検索" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "「{searchText}」を検索" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIFを検索" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "ログアウト時の検索は現在利用できません" @@ -8565,11 +7950,7 @@ msgstr "色を選択" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "理由を選択" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "複数のメディアタイプの選択はサポートされていませ #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "自傷または危険行為" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "生年月日を設定" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "新しいパスワードを設定" +msgstr "新しいパスワードを設定<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "投稿に返信できるグループを正確に設定します" +msgstr "投稿に返信できるグループを正確に設定します>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "アカウントを設定する" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "返信を表示" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "返信の表示方法" +msgstr "返信の表示方法<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "返信を全員に見せる" @@ -9062,13 +8423,9 @@ msgstr "警告を表示" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "警告の表示とフィードからのフィルタリング" +msgstr "警告の表示とフィードからのフィルタリング<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "この投稿がいつ作成されたかについての情報を表示する" @@ -9089,7 +8446,7 @@ msgstr "コンテンツを表示" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "ソース：<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "スパム" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "スパム、過剰なメンションや返信" -======= -msgstr "スパム、その他の不正・欺瞞的行為" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "あなたへのおすすめ" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "きわどい" +msgstr "きわどい<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "サンライズ" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "サンセット" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "タップして消す" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "特定個人への執拗な嫌がらせ" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "規約" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "利用規約" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "使用されている用語がコミュニティ基準に違反している" - -======= ->>>>>>> upstream/main +msgstr "利用規約<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "テキストとタグ" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "これで全部です！" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "このアカウントは、ブロック解除後にあなたとやり取りすることができます。" @@ -9803,17 +9115,12 @@ msgstr "サーバーへの問い合わせ中に問題が発生しました" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "サーバーへの問い合わせ中に問題が発生したので、インターネットへの接続を確認の上、もう一度試してください。" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "通知の取得中に問題が発生しました。もう一度試すにはこちらをタップしてください。" +msgstr "通知の取得中に問題が発生しました。もう一度試すにはこちらをタップしてください。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "投稿の取得中に問題が発生しました。もう一度試すにはこちらをタップしてください。" @@ -9852,16 +9159,9 @@ msgstr "フィードの更新中に問題が発生したので、インターネ #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "アプリケーションに予期しない問題が発生しました。 #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Blueskyに新規ユーザーが殺到しています！できるだけ早くアカウントを有効にできるよう努めます。" +msgstr "Blueskyに新規ユーザーが殺到しています！できるだけ早くアカウントを有効にできるよう努めます。<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "これらはデフォルトの設定です" ->>>>>>> upstream/main +msgstr "これらはデフォルトの設定です>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "このリストは空です。" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "このモデレーションのサービスはご利用できません。詳細は以下をご覧ください。この問題が解決しない場合は、サポートへお問い合わせください。" +msgstr "このモデレーションのサービスはご利用できません。詳細は以下をご覧ください。この問題が解決しない場合は、サポートへお問い合わせください。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "<0>{0}に投稿されたと表示されていますが、Blueskyに初めて登場したのは<1>{1}です。" @@ -10179,11 +9469,7 @@ msgstr "スレッドの設定" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "脅迫または扇動" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "トピック" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "翻訳" @@ -10262,11 +9541,7 @@ msgstr "話題のビデオ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "トローリング（荒らし）" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "ブロックを解除" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "アカウントのブロックを解除" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "アカウントのブロックを解除しますか？" @@ -10406,16 +9672,8 @@ msgstr "リポストを元に戻す" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "リポストを元に戻す（{0, plural, other {#件のリポスト}}）" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "フォローを解除" +msgstr "リポストを元に戻す（{0, plural, other {#件のリポスト}}）<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0}のフォローを解除" @@ -10443,32 +9701,18 @@ msgstr "不明な認証" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "ラベルのない成人向けコンテンツ" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "ラベルなし、虐待的、または合意のない成人向けコンテンツ" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "いいねを外す" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "いいねを外す（{0, plural, other {#件のいいね}}）" @@ -10579,16 +9823,8 @@ msgstr "リストの登録を解除しました" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "サポートしていないビデオ形式：{mimeType}" +msgstr "サポートしていないビデオ形式：{mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "望まない性的なコンテンツ" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "テキストファイルのアップロード先：" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "カメラからアップロード" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "ファイルからアップロード" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "ライブラリーからアップロード" @@ -10664,7 +9900,7 @@ msgstr "画像をアップロード中…" msgid "Uploading link thumbnail..." msgstr "リンクのサムネイルをアップロード中…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "ビデオをアップロード中…" @@ -10918,7 +10154,7 @@ msgstr "ビデオが見つかりません。" msgid "Video settings" msgstr "ビデオの設定" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "ビデオをアップロードしました" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "表示" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0}のアバターを表示" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "詳細についてのブログの記事を見る" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "デバッグエントリーを表示" +msgstr "デバッグエントリーを表示<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "詳細を表示" @@ -11013,10 +10248,6 @@ msgstr "投稿を表示" msgid "View profile" msgstr "プロフィールを表示" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "アバターを表示" @@ -11060,15 +10291,10 @@ msgstr "ミュートしたアカウントを見る" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "あなたの認証情報を表示" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "あなたの認証情報を表示<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "画像全体を表示" @@ -11078,24 +10304,16 @@ msgstr "ビデオを没入モードで表示" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "暴力的または脅迫的なコンテンツ>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "暴力行為（暴力）" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "暴力的または脅迫的なコンテンツ" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "大変申し訳ありませんが、このリストを解決できませ msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "大変申し訳ありませんが、現在ミュートされたワードを読み込むことができませんでした。もう一度お試しください。" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "大変申し訳ありませんが、検索を完了できませんでした。数分後にもう一度お試しください。" @@ -11346,11 +10564,7 @@ msgstr "なぜ異議申し立てをするのですか？" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "なぜこの会話をレビューする必要がありますか？" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "なぜこのユーザーをレビューする必要がありますか？" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "ユーザーをブロックするかこの会話を削除しますか（あるいは両方）？" ->>>>>>> upstream/main +msgstr "ユーザーをブロックするかこの会話を削除しますか（あるいは両方）？>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "アプリパスワードでサインインしています。アカウン #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "このラベルは既に異議申し立て済みで、モデレーションチームによって審査されています。" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/km/messages.po b/src/locale/locales/km/messages.po index 2d8e9428c..875939627 100644 --- a/src/locale/locales/km/messages.po +++ b/src/locale/locales/km/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {អ្នកតាម} other {អ្នកតាម}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {អ្នកកំពុងតាម} other {អ្នកកំពុងតាម}}" +msgstr "{0, plural, one {អ្នកកំពុងតាម} other {អ្នកកំពុងតាម}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} នៅ {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "ភាពងាយស្រួល" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "ការកំណត់មានភាពងាយស្រួល" +msgstr "ការកំណត់មានភាពងាយស្រួល<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "គណនី" +msgstr "គណនី<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "គណនីត្រូវបានរារាំង" @@ -661,26 +634,18 @@ msgstr "គណនីត្រូវបានបិទសំឡេងដោយប #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "ជម្រើសគណនី" +msgstr "ជម្រើសគណនី<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "គណនីត្រូវបានដកចេញពីការចូលប្រើរហ័ស" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "គណនីត្រូវបានបិទ" @@ -770,7 +735,7 @@ msgstr "បន្ថែមគណនីផ្សេងទៀត" msgid "Add another post" msgstr "បន្ថែមប្រកាសមួយទៀត" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "មាតិកាសម្រាប់មនុស្សពេញវ័យ" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "បញ្ហាដែលមិនត្រូវបានរួមបញ្ចូលនៅក្នុងជម្រើសទាំងនេះ" @@ -1177,19 +1134,10 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" ->>>>>>> upstream/main msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 @@ -1241,15 +1189,10 @@ msgstr "ឈ្មោះពាក្យសម្ងាត់កម្មវិធ #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "ពាក្យសម្ងាត់កម្មវិធី" +msgstr "ពាក្យសម្ងាត់កម្មវិធី<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "ពាក្យសម្ងាត់កម្មវិធី" @@ -1282,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "ប្តឹងឧទ្ធរណ៍លើការសម្រេចចិត្តនេះ។" +msgstr "ប្តឹងឧទ្ធរណ៍លើការសម្រេចចិត្តនេះ។<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "រូបរាង" @@ -1306,23 +1242,14 @@ msgstr "អនុវត្ត​មតិព័ត៌មាន​ដែល​ប #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "បានរក្សាទុកពី {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "បានរក្សាទុកពី {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "" @@ -1391,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1415,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1430,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1495,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "ថ្ងៃកំណើត" +msgstr "ថ្ងៃកំណើត<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1505,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "ទប់ស្កាត់" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "បិទគណនី" @@ -1545,15 +1446,8 @@ msgstr "បិទគណនី" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "បញ្ជីទប់ស្កាត់" @@ -1573,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "រារាំង" @@ -1616,40 +1506,18 @@ msgstr "ការទប់ស្កាត់ជាសាធារណៈ។ គ #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "ការទប់ស្កាត់នឹងមិនរារាំងស្លាកមិនឱ្យអនុវត្តនៅលើគណនីរបស់អ្នកទេ ប៉ុន្តែវានឹងបញ្ឈប់គណនីនេះពីការឆ្លើយតបនៅក្នុងខ្សែស្រឡាយរបស់អ្នក ឬធ្វើអន្តរកម្មជាមួយអ្នក" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky មិនអាចបញ្ជាក់ពីភាពត្រឹមត្រូវនៃកាលបរិច្ឆេទដែលបានទាមទារនោះទេ" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "ប្លុក" +msgstr "ការទប់ស្កាត់នឹងមិនរារាំងស្លាកមិនឱ្យអនុវត្តនៅលើគណនីរបស់អ្នកទេ ប៉ុន្តែវានឹងបញ្ឈប់គណនីនេះពីការឆ្លើយតបនៅក្នុងខ្សែស្រឡាយរបស់អ្នក ឬធ្វើអន្តរកម្មជាមួយអ្នក<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky មិនអាចបញ្ជាក់ពីភាពត្រឹមត្រូវនៃកាលបរិច្ឆេទដែលបានទាមទារនោះទេ" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky គឺជាបណ្តាញបើកចំហដែលអ្នកអាចជ្រើសរើសអ្នកផ្តល់សេវាបង្ហោះរបស់អ្នក។ ប្រសិនបើអ្នកជាអ្នកអភិវឌ្ឍន៍ អ្នកអាចធ្វើជាម្ចាស់ផ្ទះម៉ាស៊ីនមេរបស់អ្នក" @@ -1701,13 +1569,9 @@ msgstr "សៀវភៅ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "រកមើលគណនីច្រើនទៀតនៅលើទំព័ររុករក" @@ -1818,19 +1682,13 @@ msgstr "កាមេរ៉ា" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1858,17 +1716,11 @@ msgstr "បោះបង់ការបើកដំណើរការឡើងវ #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "បោះបង់ការស្វែងរក" +msgstr "បោះបង់ការស្វែងរក<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "មិនអាចធ្វើអន្តរកម្មជាមួយអ្នកប្រើប្រាស់ដែលត្រូវបានទប់ស្កាត់បានទេ" @@ -1981,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2148,19 +1996,11 @@ msgstr "" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2230,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "បិទការជូនដំណឹងអំពីការអាប់ដេតពាក្យសម្ងាត់" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2302,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "សរសេរការឆ្លើយតប" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "កំពុង​បង្ហាប់​វីដេអូ..." @@ -2532,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "ចម្លងកូដ" +msgstr "ចម្លងកូដ<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "ចម្លង DID" @@ -2704,7 +2538,7 @@ msgstr "បង្កើតគណនី" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "បង្កើតគណនី" @@ -2765,15 +2599,8 @@ msgstr "" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "ប្ដូរតាមបំណងអ្នកដែលអាចធ្វើអន្តរកម្មជាមួយនឹងការបង្ហោះនេះ" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2784,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "ងងឹត" @@ -2833,17 +2653,13 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "លំនាំដើម" @@ -2852,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3025,20 +2834,26 @@ msgstr "បិទអ៊ីមែល 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "បិទ​រំញ័រ" +msgstr "បិទ​រំញ័រ<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3052,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3122,7 +2926,7 @@ msgstr "ស្វែងរកមតិព័ត៌មានថ្មី" msgid "Dismiss" msgstr "ច្រានចោល" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "ច្រានចោលកំហុស" @@ -3210,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3262,9 +3063,8 @@ msgstr "" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3283,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3350,7 +3148,7 @@ msgid "Edit" msgstr "កែសម្រួល" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "កែសម្រួលរូបតំណាង" @@ -3625,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "កំហុស" @@ -3646,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "កំហុសបានកើតឡើងខណៈពេលរក្សាទុកឯកសារ" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "កំហុសក្នុងការទទួលការឆ្លើយតប captcha" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3672,19 +3470,8 @@ msgstr "ទាំងអស់គ្នា" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "ការលើកឡើង ឬការឆ្លើយតបច្រើនពេក" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "សារហួសហេតុ ឬមិនចង់បាន" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "មិនរាប់បញ្ចូលអ្នកប្រើប្រាស់ដែលអ្នកតាមដាន" @@ -4016,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "ព័ត៌មាន" @@ -4163,26 +3946,8 @@ msgstr "បញ្ចប់" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "សម្បទា" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "សម្បទា<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "អាចបត់បែនបាន" @@ -4193,16 +3958,7 @@ msgstr "អាចបត់បែនបាន" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "តាម" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "តាម" @@ -4245,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "តាមដានត្រឡប់វិញ" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "តាមដានត្រឡប់វិញ" @@ -4294,13 +4042,9 @@ msgstr "អ្នកតាមដែលអ្នកស្គាល់" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "កំពុងតាម" @@ -4308,16 +4052,11 @@ msgstr "កំពុងតាម" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "កំពុងតាម" +msgstr "កំពុងតាម<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "កំពុងតាម {0}" @@ -4404,15 +4143,8 @@ msgstr "ភ្លេច?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "បង្ហោះមាតិកាដែលមិនចង់បានញឹកញាប់" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4513,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "ផ្តល់ទម្រង់មុខរបស់អ្នក" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "ការបំពានច្បាប់ ឬលក្ខខណ្ឌប្រើប្រាស់ជាក់ស្តែង" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "ផ្តល់ទម្រង់មុខរបស់អ្នក<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4673,21 +4395,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "ការបៀតបៀន ការបោកប្រាស់ ឬការមិនអត់ឱន" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4716,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "មានបញ្ហា?" +msgstr "មានបញ្ហា?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4783,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "លាក់ post សម្រាប់ខ្ញុំ" @@ -4983,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "ប្រសិនបើអ្នកកំពុងព្យាយាមផ្លាស់ប្តូរចំណុចទាញ ឬអ៊ីមែលរបស់អ្នក សូមធ្វើដូច្នេះមុនពេលអ្នកបិទដំណើរការ" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "ខុសច្បាប់ និងបន្ទាន់" +msgstr "ប្រសិនបើអ្នកកំពុងព្យាយាមផ្លាស់ប្តូរចំណុចទាញ ឬអ៊ីមែលរបស់អ្នក សូមធ្វើដូច្នេះមុនពេលអ្នកបិទដំណើរការ<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "រូបភាព" @@ -5013,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "ការក្លែងបន្លំ ឬការអះអាងមិនពិតអំពីអត្តសញ្ញាណ ឬទំនាក់ទំនង" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "ការក្លែងបន្លំ ព័ត៌មានមិនពិត ឬការអះអាងមិនពិត" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5063,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "សារមិនសមរម្យ ឬតំណច្បាស់លាស់" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5099,21 +4764,13 @@ msgstr "បញ្ចូលពាក្យសម្ងាត់សម្រាប #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "បញ្ចូលលេខកូដដែលបានផ្ញើទៅអ្នក" +msgstr "បញ្ចូលលេខកូដដែលបានផ្ញើទៅអ្នក<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "អន្តរកម្មមានកំណត់" @@ -5187,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "មានតែអ្នកទេឥឡូវនេះ! បន្ថែមមនុស្សបន្ថែមទៀតទៅក្នុងកញ្ចប់ចាប់ផ្តើមរបស់អ្នកដោយស្វែងរកខាងលើ" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "" @@ -5230,17 +4887,13 @@ msgstr "ដាក់ស្លាកដោយ {0}" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "ដាក់ស្លាកដោយអ្នកនិពន្ធ" +msgstr "ដាក់ស្លាកដោយអ្នកនិពន្ធ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "ស្លាក" @@ -5305,17 +4958,9 @@ msgstr "ស្វែងយល់បន្ថែម" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "មើល​បន្ថែមទៀត​អំពី Bluesky នៅលើ Facebook" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "ស្វែងយល់បន្ថែមអំពីការបង្ហោះដោយខ្លួនឯង PDS របស់អ្នក" @@ -5350,15 +4995,10 @@ msgstr "ស្វែងយល់បន្ថែមអំពីអ្វីដែ #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "ស្វែងយល់បន្ថែម" @@ -5422,11 +5062,7 @@ msgid "Like" msgstr "" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5489,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "ចូលចិត្តនៅលើប្រកាសនេះ" @@ -5799,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "សារ" +msgstr "សារ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "គណនីបន្លំ" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "post បន្លំ" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5897,15 +5508,10 @@ msgstr "ឧបករណ៍សំរបសំរួល" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "អ្នកសម្របសម្រួលបានជ្រើសរើសដើម្បីកំណត់ការព្រមានទូទៅលើខ្លឹមសារ" +msgstr "អ្នកសម្របសម្រួលបានជ្រើសរើសដើម្បីកំណត់ការព្រមានទូទៅលើខ្លឹមសារ<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "ព័ត៌មានច្រើនទៀត" @@ -6046,18 +5652,8 @@ msgstr "មតិព័ត៌មានរបស់ខ្ញុំ" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "ឈ្មោះ ឬការពិពណ៌នាបំពានស្តង់ដារសហគមន៍" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6261,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "មិនទាន់មានអ្នកចូលចិត្តទេ" +msgstr "មិនទាន់មានអ្នកចូលចិត្តទេ<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "លែង​តាម {0}" @@ -6282,7 +5873,7 @@ msgstr "មិនមានសារនៅឡើយទេ" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "មិនមានការជូនដំណឹងនៅឡើយទេ" @@ -6336,9 +5927,9 @@ msgstr "រកមិនឃើញលទ្ធផលទេ" msgid "No results found for \"{query}\"" msgstr "រកមិនឃើញលទ្ធផលសម្រាប់ \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "រកមិនឃើញលទ្ធផលសម្រាប់ {query}" @@ -6473,15 +6064,8 @@ msgstr "ឥឡូវនេះ" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "អាក្រាតកាយ" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "អាក្រាតកាយ ឬខ្លឹមសារសម្រាប់មនុស្សពេញវ័យមិនត្រូវបានដាក់ស្លាកបែបនេះទេ" +msgstr "អាក្រាតកាយ<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6502,11 +6086,7 @@ msgid "OK" msgstr "" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "" @@ -6607,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "បើកកម្មវិធីជ្រើសរើសរូបអារម្មណ៍" @@ -6707,7 +6287,7 @@ msgstr "បើកកម្មវិធីតែង" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6747,15 +6327,10 @@ msgstr "បើកទម្រង់កំណត់ពាក្យសម្ងា #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "បើកកម្រងព័ត៌មាននេះ" @@ -6789,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "ផ្សេងទៀត។" @@ -6904,23 +6474,16 @@ msgstr "មនុស្ស​តាម @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7177,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "ការបង្ហោះ" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "ការបង្ហោះ" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Post ទាំងអស់" @@ -7205,19 +6768,12 @@ msgstr "Post ត្រូវាបានលុប" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "មិនអាចបង្ហោះសារបង្ហោះបានទេ។ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នក ហើយព្យាយាមម្តងទៀត" +msgstr "មិនអាចបង្ហោះសារបង្ហោះបានទេ។ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នក ហើយព្យាយាមម្តងទៀត<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7353,7 +6909,7 @@ msgstr "គោលការណ៍ឯកជនភាព" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "ដំណើរការវីដេអូ..." @@ -7381,19 +6937,12 @@ msgstr "បានធ្វើបច្ចុប្បន្នភាពប្រ #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "សាធារណៈ" @@ -7407,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7485,13 +7034,9 @@ msgstr "Quote posts ត្រូវបានបិទ" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "" @@ -7552,12 +7097,12 @@ msgstr "អានលក្ខខណ្ឌនៃសេវាកម្ម Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7648,8 +7193,8 @@ msgstr "យកឯកសារភ្ជាប់ចេញ" msgid "Remove Avatar" msgstr "លុប Avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "លុប Banner" @@ -7823,17 +7368,13 @@ msgstr "ការឆ្លើយតបត្រូវបានបិទ" msgid "Replies to this post are disabled." msgstr "ការឆ្លើយតបទៅនឹងការបង្ហោះនេះត្រូវបានបិទ" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "ឆ្លើយតប" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7994,13 +7535,9 @@ msgstr "ផ្សាយឡើងវិញដោយអ្នក" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "ការផ្សាយឡើងវិញនៃប្រកាសនេះ" @@ -8073,17 +7610,13 @@ msgstr "កំណត់ស្ថានភាពចាប់ផ្តើមឡើ #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "កំណត់ពាក្យសម្ងាត់ឡើងវិញ" +msgstr "កំណត់ពាក្យសម្ងាត់ឡើងវិញ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8241,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "វិទ្យាសាស្ត្រ" +msgstr "វិទ្យាសាស្ត្រ<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8298,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "ស្វែងរក \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "ស្វែងរក \"{searchText}\"" @@ -8327,7 +7857,7 @@ msgid "Search GIFs" msgstr "ស្វែងរក GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8627,19 +8157,12 @@ msgstr "កំណត់ថ្ងៃខែឆ្នាំកំណើត" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "កំណត់ពាក្យសម្ងាត់ថ្មី" +msgstr "កំណត់ពាក្យសម្ងាត់ថ្មី<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "រៀបចំគណនីរបស់អ្នក" @@ -8791,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8881,15 +8400,10 @@ msgstr "បង្ហាញការឆ្លើយតប" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "បង្ហាញការឆ្លើយតបសម្រាប់អ្នករាល់គ្នា" @@ -8909,13 +8423,9 @@ msgstr "បង្ហាញការព្រមាន" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "បង្ហាញការព្រមាន និងត្រងពីមតិព័ត៌មាន" +msgstr "បង្ហាញការព្រមាន និងត្រងពីមតិព័ត៌មាន<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8936,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9143,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "សារឥតបានការ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "សារឥតបានការ; ការលើកឡើង ឬការឆ្លើយតបច្រើនពេក" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9315,23 +8813,9 @@ msgstr "បានណែនាំសម្រាប់អ្នក" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "ណែនាំ" +msgstr "ណែនាំ<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9449,18 +8933,8 @@ msgstr "លក្ខខណ្ឌ" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "លក្ខខណ្ឌនៃសេវាកម្ម" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "លក្ខខណ្ឌប្រើប្រាស់បំពានស្តង់ដារសហគមន៍" - -======= ->>>>>>> upstream/main +msgstr "លក្ខខណ្ឌនៃសេវាកម្ម<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "អត្ថបទ & ស្លាក" @@ -9509,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "គណនីនឹងអាចធ្វើអន្តរកម្មជាមួយអ្នកបន្ទាប់ពីឈប់ទប់ស្កាត់" @@ -9645,17 +9115,12 @@ msgstr "មានបញ្ហាក្នុងការទាក់ទងម៉ msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "មានបញ្ហាក្នុងការទាក់ទងម៉ាស៊ីនមេ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នក ហើយព្យាយាមម្តងទៀត" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "មានបញ្ហាក្នុងការទាញយកការជូនដំណឹង។ ចុចទីនេះដើម្បីព្យាយាមម្តងទៀត" +msgstr "មានបញ្ហាក្នុងការទាញយកការជូនដំណឹង។ ចុចទីនេះដើម្បីព្យាយាមម្តងទៀត<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "មានបញ្ហាក្នុងការទាញយកសារបង្ហោះ។ ចុចទីនេះដើម្បីព្យាយាមម្តងទៀត" @@ -9694,16 +9159,9 @@ msgstr "មានបញ្ហាក្នុងការធ្វើបច្ច #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9731,19 +9189,14 @@ msgstr "មានបញ្ហាដែលមិននឹកស្មានដល #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "មានការប្រញាប់ប្រញាល់នៃអ្នកប្រើប្រាស់ថ្មីទៅកាន់ Bluesky! យើងនឹងដំណើរការគណនីរបស់អ្នកឱ្យបានឆាប់តាមដែលយើងអាចធ្វើបាន" +msgstr "មានការប្រញាប់ប្រញាល់នៃអ្នកប្រើប្រាស់ថ្មីទៅកាន់ Bluesky! យើងនឹងដំណើរការគណនីរបស់អ្នកឱ្យបានឆាប់តាមដែលយើងអាចធ្វើបាន<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9896,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "សេវាកម្មសម្របសម្រួលនេះមិនមានទេ។ សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិតបន្ថែម។ ប្រសិនបើបញ្ហានេះនៅតែបន្តកើតមាន សូមទាក់ទងមកយើងខ្ញុំ" +msgstr "សេវាកម្មសម្របសម្រួលនេះមិនមានទេ។ សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិតបន្ថែម។ ប្រសិនបើបញ្ហានេះនៅតែបន្តកើតមាន សូមទាក់ទងមកយើងខ្ញុំ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "ប្រកាសនេះអះអាងថាត្រូវបានបង្កើតឡើងនៅលើ <0>{0} ប៉ុន្តែត្រូវបានមើលឃើញជាលើកដំបូងដោយ Bluesky នៅលើ <1>{1}" @@ -10070,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "បកប្រែ" @@ -10202,22 +9644,13 @@ msgstr "ឈប់ទប់ស្កាត់" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "បិទគណនី" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "បិទគណនី?" @@ -10239,16 +9672,8 @@ msgstr "បោះបង់ការបង្ហោះឡើងវិញ" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "ឈប់តាម" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "ឈប់តាម {0}" @@ -10280,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10406,16 +9823,8 @@ msgstr "ឈប់ជាវពីបញ្ជី" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "ខ្លឹមសារផ្លូវភេទដែលមិនចង់បាន" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10465,20 +9874,20 @@ msgstr "បង្ហោះឯកសារអត្ថបទទៅ៖" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "បង្ហោះពីកាមេរ៉ា" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "បង្ហោះពីឯកសារ" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "បង្ហោះពីបណ្ណាល័យ" @@ -10491,7 +9900,7 @@ msgstr "កំពុងបង្ហោះរូបភាព..." msgid "Uploading link thumbnail..." msgstr "កំពុងបង្ហោះរូបភាពតូចនៃតំណ..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "កំពុងបង្ហោះវីដេអូ..." @@ -10745,7 +10154,7 @@ msgstr "រកមិនឃើញវីដេអូ" msgid "Video settings" msgstr "ការកំណត់វីដេអូ" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "បង្ហោះវីដេអូ" @@ -10770,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "មើលរូបតំណាងរបស់ {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10796,15 +10209,10 @@ msgstr "មើលប្លុកសម្រាប់ព័ត៌មានលម #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "មើលធាតុបំបាត់កំហុស" +msgstr "មើលធាតុបំបាត់កំហុស<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "មើលព័ត៌មានលម្អិត" @@ -10840,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "មើលប្រវត្តិរូប" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "មើលរូបតំណាង" @@ -10887,15 +10291,10 @@ msgstr "មើលគណនីដែលបានបិទរបស់អ្នក #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10909,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11067,7 +10463,7 @@ msgstr "យើងសុំទោស ប៉ុន្តែយើងមិនអ msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "យើងសុំទោស ប៉ុន្តែយើងមិនអាចផ្ទុកពាក្យដែលអ្នកបានបិទសំឡេងនៅពេលនេះបានទេ។ សូមព្យាយាមម្តងទៀត" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "យើងសុំទោស ប៉ុន្តែការស្វែងរករបស់អ្នកមិនអាចបញ្ចប់បានទេ។ សូមព្យាយាមម្តងទៀតក្នុងរយៈពេលពីរបីនាទីទៀត" @@ -11195,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "ហេតុអ្វីបានជាអ្នកប្រើប្រាស់នេះគួរត្រូវបានពិនិត្យ?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/ko/messages.po b/src/locale/locales/ko/messages.po index f5ada88c6..1f6dc5430 100644 --- a/src/locale/locales/ko/messages.po +++ b/src/locale/locales/ko/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, other {팔로워}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, other {팔로우 중}}" +msgstr "{0, plural, other {팔로우 중}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {좋아요}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {게시물}}" +msgstr "{0, plural, other {게시물}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {인용}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {재게시}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {인용}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {재게시}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, other {저장}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+#명}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (계정)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>로그인<1>하거나 <2>계정을 만들고<3> <4>뉴스, 스포츠, 정치 등 Bluesky의 다양한 소식을 검색하세요." @@ -587,11 +567,7 @@ msgstr "정보" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "모욕 또는 차별 행위" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "접근성" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "접근성 설정" +msgstr "접근성 설정<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "계정" +msgstr "계정<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "계정을 차단했습니다" @@ -669,26 +634,18 @@ msgstr "리스트로 계정 뮤트됨" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "계정 옵션" +msgstr "계정 옵션<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "계정 제공자" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "빠른 액세스에서 계정 제거" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "계정을 차단 해제했습니다" @@ -778,7 +735,7 @@ msgstr "다른 계정 추가" msgid "Add another post" msgstr "다른 게시물 추가하기" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "스레드에 다른 게시물 추가" @@ -889,20 +846,12 @@ msgstr "성인물" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "성인 콘텐츠" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "성인 콘텐츠" @@ -921,11 +870,7 @@ msgstr "성인 콘텐츠 라벨" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "성인 성착취물" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Bluesky가 신뢰할 수 있는 인증자를 선정하고 신뢰할 수 있는 인증자가 차례로 개별 사용자 계정을 인증하는 과정을 보여주는 그림." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "어떤 옵션에도 포함되지 않는 문제" @@ -1171,19 +1112,11 @@ msgstr "및" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "동물 성적 학대" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "동물 보호" ->>>>>>> upstream/main +msgstr "동물 보호>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "공지사항" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky의 인증 기능 소개" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "반사회적 행위" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Bluesky의 인증 기능 소개<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "누구나" ->>>>>>> upstream/main +msgstr "누구나>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "앱 비밀번호 이름은 4자 이상이어야 합니다" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "앱 비밀번호" +msgstr "앱 비밀번호<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "앱 비밀번호" @@ -1307,19 +1225,12 @@ msgstr "일시 정지 이의신청" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "이 결정에 이의신청" +msgstr "이 결정에 이의신청<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "모양" @@ -1331,23 +1242,14 @@ msgstr "기본 추천 피드 적용하기" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "풀 리퀘스트 적용" +msgstr "풀 리퀘스트 적용<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0}에 보관됨" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0}에 보관됨" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "보관된 게시물" @@ -1416,18 +1318,11 @@ msgstr "알고리즘에 주제 지정" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "8자 이상" +msgstr "8자 이상<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "오로라" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "사용 가능" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "사용 가능" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,24 +1360,12 @@ msgstr "대화로 돌아가기" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= msgstr "금지된 활동 또는 보안 위반" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -<<<<<<< HEAD -msgstr "차단된 사용자의 복귀" ->>>>>>> upstream/main -======= -msgstr "정지당한 사용자의 복귀" ->>>>>>> upstream/main - #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 msgid "Before creating a list, you must first verify your email." @@ -1533,9 +1411,8 @@ msgstr "아래 항목을 작성하여 연령 확인 절차를 시작하세요." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "생년월일" +msgstr "생년월일<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1543,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "차단" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "계정 차단" @@ -1583,15 +1446,8 @@ msgstr "계정 차단" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "차단 및 삭제" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "이 대화를 차단 또는 삭제합니다" +msgstr "차단 및 삭제<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "리스트 차단" @@ -1611,18 +1467,14 @@ msgstr "사용자 차단" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "사용자 차단" +msgstr "사용자 차단<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "사용자를 차단하거나 이 대화를 삭제하기" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "차단됨" @@ -1654,40 +1506,18 @@ msgstr "차단 목록은 공개됩니다. 차단한 계정은 내 스레드에 #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "차단하더라도 내 계정에 라벨이 붙는 것은 막지 못하지만, 이 계정이 내 스레드에 답글을 달거나 나와 상호작용하는 것은 중지됩니다." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky는 해당 날짜의 진위를 확인할 수 없습니다." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "블로그" +msgstr "차단하더라도 내 계정에 라벨이 붙는 것은 막지 못하지만, 이 계정이 내 스레드에 답글을 달거나 나와 상호작용하는 것은 중지됩니다.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky는 해당 날짜의 진위를 확인할 수 없습니다." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky는 호스팅 제공자를 선택할 수 있는 개방형 네트워크입니다. 개발자라면 직접 서버를 호스팅할 수 있습니다." @@ -1739,15 +1569,9 @@ msgstr "책" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "사이트 규칙 위반" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "탐색 페이지에서 더 많은 계정 찾아보기" @@ -1858,19 +1682,13 @@ msgstr "카메라" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1898,17 +1716,11 @@ msgstr "재활성화 취소 및 로그아웃" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "검색 취소" +msgstr "검색 취소<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "차단된 사용자와 상호작용할 수 없습니다" @@ -1959,11 +1771,7 @@ msgstr "비밀번호 변경 대화 상자" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "신고 카테고리 변경" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2025,11 +1833,7 @@ msgid "Chat requests" msgstr "대화 요청" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2066,19 +1870,11 @@ msgstr "받은 편지함에서 아래에 입력할 인증 코드가 포함된 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "아동 안전" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "아동 성착취물" ->>>>>>> upstream/main +msgstr "아동 성착취물>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2200,19 +1996,11 @@ msgstr "다그닥 🐴 다그닥 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2282,7 +2070,7 @@ msgstr "환영 대화 상자 닫기" msgid "Closes password update alert" msgstr "비밀번호 변경 알림을 닫습니다" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "게시물 작성기를 닫고 게시물 초안을 삭제합니다" @@ -2354,7 +2142,7 @@ msgstr "게시물을 최대 {0, plural, other {#자}}까지 작성할 수 있습 msgid "Compose reply" msgstr "답글 작성하기" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "동영상 압축 중…" @@ -2476,11 +2264,7 @@ msgstr "콘텐츠를 사용할 수 없음" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "자해를 조장하거나 묘사하는 콘텐츠" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2588,17 +2372,11 @@ msgstr "작성자 DID 복사" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "코드 복사" +msgstr "코드 복사<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID 복사" @@ -2760,7 +2538,7 @@ msgstr "계정 만들기" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "계정 만들기" @@ -2821,35 +2599,16 @@ msgstr "사용자 지정" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "사용자 지정 옵션" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "이 게시물과 상호작용할 수 있는 사용자를 맞춤 설정합니다." +msgstr "사용자 지정 옵션<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "내 Bluesky 경험을 맞춤 설정합니다" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "위험한 챌린지 또는 활동" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "위험 물질 또는 약물 남용" @@ -2858,7 +2617,6 @@ msgstr "위험 물질 또는 약물 남용" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "어두움" @@ -2895,19 +2653,13 @@ msgstr "디버그 패널" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "딥페이크 성인 콘텐츠" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "기본" @@ -2916,17 +2668,10 @@ msgid "Default icons" msgstr "기본 아이콘" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3089,20 +2834,26 @@ msgstr "이메일 2단계 인증 끄기" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "햅틱 피드백 끄기" +msgstr "햅틱 피드백 끄기<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "답글을 완전히 비활성화>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3116,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "답글을 완전히 비활성화" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3187,7 +2926,7 @@ msgstr "새 피드 발견하기" msgid "Dismiss" msgstr "닫기" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "오류 무시" @@ -3275,11 +3014,8 @@ msgstr "걱정 마세요! 모든 기존 메시지와 설정은 저장되며 성 #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3327,9 +3063,8 @@ msgstr "Bluesky 다운로드" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR 파일 다운로드" +msgstr "CAR 파일 다운로드<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3352,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "신상 털기" ->>>>>>> upstream/main +msgstr "신상 털기>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3401,11 +3131,7 @@ msgstr "예: 반복적으로 광고 답글을 다는 계정." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "섭식 장애" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3422,7 +3148,7 @@ msgid "Edit" msgstr "편집" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "아바타 편집" @@ -3697,7 +3423,7 @@ msgstr "전체화면으로 봅니다" msgid "Entertainment" msgstr "엔터테인먼트" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "오류" @@ -3718,11 +3444,11 @@ msgstr "오류 메시지" msgid "Error occurred while saving file" msgstr "파일을 저장하는 동안 오류가 발생했습니다" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "캡차 응답을 수신하는 동안 오류가 발생했습니다." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "오류: {error}" @@ -3744,19 +3470,8 @@ msgstr "모두" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "기타" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "과도한 멘션 또는 답글" +msgstr "기타<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "과도하거나 원치 않는 메시지" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "내가 팔로우하는 사용자 제외하기" @@ -3880,11 +3595,7 @@ msgstr "외부 미디어 설정" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "극단주의 콘텐츠" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4088,23 +3799,13 @@ msgstr "핸들을 인증하지 못했습니다. 다시 시도해 주세요." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "가짜 계정 또는 봇" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "선거에 대한 허위 정보" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "피드" @@ -4245,26 +3946,8 @@ msgstr "완료" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "건강" +msgstr "건강<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "플랫 블랙" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "플랫 블루" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "플랫 화이트" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "유연성" @@ -4275,16 +3958,7 @@ msgstr "유연성" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "팔로우" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "팔로우" @@ -4327,16 +4001,8 @@ msgstr "모든 계정을 팔로우" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "맞팔로우" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "맞팔로우" @@ -4376,13 +4042,9 @@ msgstr "내가 아는 팔로워" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "팔로우 중" @@ -4390,16 +4052,11 @@ msgstr "팔로우 중" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "팔로우 중" +msgstr "팔로우 중<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0} 님을 팔로우했습니다" @@ -4486,15 +4143,8 @@ msgstr "분실" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "피드를 자유롭게" +msgstr "피드를 자유롭게<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "잦은 원치 않는 콘텐츠 게시" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "수신 대상" @@ -4595,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "프로필에 얼굴 달기" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "명백한 법률 또는 서비스 이용약관 위반 행위" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "폭력 미화" ->>>>>>> upstream/main +msgstr "프로필에 얼굴 달기<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4716,18 +4356,7 @@ msgstr "불쾌감을 주는 미디어" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "불쾌감을 주는 폭력 콘텐츠" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4735,8 +4364,7 @@ msgstr "그루밍 또는 포식 행위" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "해킹 또는 시스템 공격" ->>>>>>> upstream/main +msgstr "해킹 또는 시스템 공격>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4767,24 +4395,8 @@ msgstr "햅틱" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "괴롭힘, 분쟁 유발 또는 차별" -======= -msgstr "괴롭힘 또는 혐오" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "유해하거나 위험성이 큰 활동" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "미성년자에게 유해 또는 위험에 빠뜨리는 행위" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4803,11 +4415,7 @@ msgstr "해시태그 #{tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "혐오 발언" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4816,15 +4424,10 @@ msgstr "코드가 있나요? <0>이곳을 클릭하세요." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "문제가 있나요?" +msgstr "문제가 있나요?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4883,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "사용자 지정 옵션 숨기기" +msgstr "사용자 지정 옵션 숨기기<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "리스트 숨기기" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "나에게서 게시물 숨기기" @@ -5019,11 +4613,7 @@ msgstr "이 링크를 어떻게 여시겠습니까?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "인신매매" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5087,17 +4677,9 @@ msgstr "개발자라면 직접 서버를 호스팅할 수 있습니다." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "핸들이나 이메일을 변경하려는 경우 비활성화하기 전에 변경하세요." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "불법 및 긴급 사항" +msgstr "핸들이나 이메일을 변경하려는 경우 비활성화하기 전에 변경하세요.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "이미지" @@ -5117,29 +4699,15 @@ msgstr "이미지를 저장했습니다" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "사진 보관함에 대한 접근 권한이 부여되지 않으면 이미지를 저장할 수 없습니다." +msgstr "사진 보관함에 대한 접근 권한이 부여되지 않으면 이미지를 저장할 수 없습니다.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "신원 또는 소속에 대한 사칭 또는 허위 주장" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "사칭, 허위 정보 또는 허위 주장" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "사칭" ->>>>>>> upstream/main +msgstr "사칭>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5167,15 +4735,8 @@ msgstr "인앱, 푸시, 모두" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "인앱, 푸시, 내가 팔로우하는 사용자" +msgstr "인앱, 푸시, 내가 팔로우하는 사용자<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "부적절한 메시지 또는 노골적인 링크" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5203,21 +4764,13 @@ msgstr "계정을 삭제하기 위해 비밀번호를 입력합니다" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "이메일로 전송된 코드를 입력합니다" +msgstr "이메일로 전송된 코드를 입력합니다<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "상호작용 제한됨" @@ -5291,7 +4844,7 @@ msgstr "지금은 <0>{0}밖에 없습니다! 위에서 검색하여 스타 msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "아직은 나밖에 없습니다! 위에서 검색하여 스타터 팩에 더 많은 사용자를 추가해 보세요." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "작업 ID: {0}" @@ -5334,17 +4887,13 @@ msgstr "{0}(이)가 라벨 지정함." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "작성자가 라벨 지정함." +msgstr "작성자가 라벨 지정함.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "라벨" @@ -5409,17 +4958,9 @@ msgstr "더 알아보기" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "연령 확인에 대해 자세히 알아보기" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Bluesky에 대해 더 알아보기" +msgstr "연령 확인에 대해 자세히 알아보기<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "PDS 셀프 호스팅에 대해 자세히 알아보세요." @@ -5454,15 +4995,10 @@ msgstr "Bluesky에서 공개되는 항목에 대해 자세히 알아보세요." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<0>계정 설정에서 자세히 알아보세요." +msgstr "<0>계정 설정에서 자세히 알아보세요.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "더 알아보기" @@ -5526,11 +5062,7 @@ msgid "Like" msgstr "좋아요" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "좋아요 ({0, plural, other {#개}})" @@ -5593,13 +5125,9 @@ msgstr "내 재게시물의 좋아요" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "내 재게시물의 좋아요 알림" +msgstr "내 재게시물의 좋아요 알림<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "이 게시물을 좋아요 표시합니다" @@ -5903,49 +5431,24 @@ msgstr "메시지 옵션" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "메시지" +msgstr "메시지<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "심야" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "미성년자 괴롭힘 또는 따돌림" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "기타 알림" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "오해의 소지가 있는 계정" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "오해의 소지가 있는 게시물" -======= -msgstr "오해 소지" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6005,15 +5508,10 @@ msgstr "검토 도구" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "검토자가 콘텐츠에 일반 경고를 설정했습니다." +msgstr "검토자가 콘텐츠에 일반 경고를 설정했습니다.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "피드 더 보기" @@ -6154,18 +5652,8 @@ msgstr "내 피드" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "이름" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "이름 또는 설명이 커뮤니티 기준을 위반함" - -======= ->>>>>>> upstream/main +msgstr "이름<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6192,11 +5680,7 @@ msgstr "내 프로필로 이동합니다" #: src/components/moderation/ReportDialog/index.tsx:320 #: src/components/moderation/ReportDialog/index.tsx:337 msgid "Need to report a copyright violation, legal request, or regulatory compliance issue?" -<<<<<<< HEAD -msgstr "저작권 위반, 법적 요청 또는 규정 준수 문제를 신고해야 하나요?" -======= -msgstr "저작권 위반, 법적 요청 또는 규제 준수 문제를 신고해야 하나요?" ->>>>>>> upstream/main +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:409 msgid "Never lose access to your followers or data." @@ -6373,16 +5857,11 @@ msgstr "이미지 없음" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "아직 좋아요 없음" +msgstr "아직 좋아요 없음<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} 님을 언팔로우했습니다" @@ -6394,7 +5873,7 @@ msgstr "아직 메시지가 없습니다" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "더 이상 쓰레기 같은 정보만 보여주는 알고리즘에 끌려다니지 마세요. 나를 방해하는 피드가 아닌 나를 위한 피드를 찾아보세요." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "아직 알림이 없습니다" @@ -6448,9 +5927,9 @@ msgstr "결과를 찾을 수 없음" msgid "No results found for \"{query}\"" msgstr "‘{query}’에 대한 결과를 찾을 수 없습니다" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "{query}에 대한 결과를 찾을 수 없습니다" @@ -6490,11 +5969,7 @@ msgstr "아무도 찾을 수 없습니다. 다른 사용자를 검색해 보세 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "동의받지 않은 사적인 성적 이미지" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6589,15 +6064,8 @@ msgstr "지금" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "나체" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "나체 또는 성인 콘텐츠로 설정되지 않은 콘텐츠" +msgstr "나체<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6618,11 +6086,7 @@ msgid "OK" msgstr "확인" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "확인" @@ -6723,7 +6187,7 @@ msgid "Open drawer menu" msgstr "서랍 메뉴 열기" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "이모티콘 선택기 열기" @@ -6823,7 +6287,7 @@ msgstr "답글 작성 상자를 엽니다" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "기기 갤러리를 열어 이미지를 최대 {MAX_IMAGES, plural, other {#개}}까지 또는 동영상, GIF를 1개 선택합니다." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "이모티콘 선택기를 엽니다" @@ -6863,15 +6327,10 @@ msgstr "비밀번호 재설정 양식을 엽니다" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "게시물 언어 설정을 엽니다" +msgstr "게시물 언어 설정을 엽니다<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "이 프로필을 엽니다" @@ -6905,12 +6364,7 @@ msgstr "OTA 상태: 사용할 수 없음" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "기타" @@ -6920,35 +6374,8 @@ msgstr "다른 계정" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "기타 아동 안전 문제" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "기타 위험 콘텐츠" @@ -6971,8 +6398,7 @@ msgstr "기타 성폭력 콘텐츠" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "기타 폭력적인 콘텐츠" ->>>>>>> upstream/main +msgstr "기타 폭력적인 콘텐츠>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7048,23 +6474,16 @@ msgstr "@{0} 님을 팔로우하는 사용자" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "내가 팔로우하는 사용자" +msgstr "내가 팔로우하는 사용자<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "내가 팔로우하는 사용자" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "내가 멘션한 사용자" +msgstr "내가 멘션한 사용자>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "사진 보관함에 대한 접근 권한이 거부되었습니다. 시스템 설정에서 활성화해 주세요." @@ -7321,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "게시물" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "게시하기" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "모두 게시하기" @@ -7349,19 +6768,12 @@ msgstr "게시물을 삭제했습니다" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "게시물을 업로드하지 못했습니다. 인터넷 연결을 확인한 후 다시 시도해 주세요." +msgstr "게시물을 업로드하지 못했습니다. 인터넷 연결을 확인한 후 다시 시도해 주세요.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "게시물 삭제됨" @@ -7495,13 +6907,9 @@ msgstr "개인정보 처리방침" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "미성년자 사생활 침해" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "동영상 처리 중…" @@ -7529,15 +6937,11 @@ msgstr "프로필을 업데이트했습니다" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "금지 품목 또는 서비스의 홍보 또는 판매" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "쉿! 이 게시물과 상호작용할 수 있는 사용자를 편집할 수 있어요." ->>>>>>> upstream/main +msgstr "쉿! 이 게시물과 상호작용할 수 있는 사용자를 편집할 수 있어요.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7552,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "피드를 탐색하는 데 사용할 수 있는 공개적이고 공유 가능한 목록입니다." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "게시물 등록하기" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "게시물 등록하기" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "답글 등록하기" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "답글 등록하기" @@ -7630,13 +7034,9 @@ msgstr "게시물 인용 비활성화됨" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "인용" +msgstr "인용<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "이 게시물의 인용" @@ -7697,12 +7097,12 @@ msgstr "Bluesky 서비스 이용약관 읽기" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7793,8 +7193,8 @@ msgstr "첨부 제거" msgid "Remove Avatar" msgstr "아바타 제거" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "배너 제거" @@ -7968,17 +7368,13 @@ msgstr "답글 비활성화됨" msgid "Replies to this post are disabled." msgstr "이 게시물에 대한 답글은 비활성화되어 있습니다." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "답글 보내기" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "답글 ({0, plural, other {#개}})" @@ -8068,11 +7464,7 @@ msgstr "신고 제출됨" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "이 대화 신고하기" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8143,13 +7535,9 @@ msgstr "내가 재게시함" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "재게시" +msgstr "재게시<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "이 게시물의 재게시물" @@ -8222,17 +7610,13 @@ msgstr "온보딩 상태 초기화" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "비밀번호 재설정" +msgstr "비밀번호 재설정<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "로그인을 다시 시도합니다" @@ -8385,28 +7769,21 @@ msgstr "인사해 보세요!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "사기" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "과학" +msgstr "과학<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "왼쪽으로 스크롤" @@ -8451,11 +7828,11 @@ msgstr "‘{interestsDisplayName}’ 검색" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "‘{interestsDisplayName}’ 검색 (활성)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "‘{query}’에 대한 검색 결과" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "‘{searchText}’에 대한 검색 결과" @@ -8480,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF 검색하기" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "현재 로그아웃 상태에서는 검색 기능을 사용할 수 없습니다" @@ -8573,11 +7950,7 @@ msgstr "색상 선택" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "이유 선택" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8714,11 +8087,7 @@ msgstr "여러 유형의 미디어를 함께 선택할 수 없습니다." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "자해 또는 위험 행위" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8788,19 +8157,12 @@ msgstr "생년월일 설정" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "새 비밀번호 설정" +msgstr "새 비밀번호 설정<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "내 게시물에 답글을 달 수 있는 사용자 그룹을 설정하세요" +msgstr "내 게시물에 답글을 달 수 있는 사용자 그룹을 설정하세요>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "계정 설정하기" @@ -8952,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9042,15 +8400,10 @@ msgstr "답글 표시" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "답글 표시 형식" +msgstr "답글 표시 형식<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "모두에게 답글 표시" @@ -9070,13 +8423,9 @@ msgstr "경고 표시" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "경고 표시 및 피드에서 필터링" +msgstr "경고 표시 및 피드에서 필터링<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "이 게시물이 언제 작성되었는지에 대한 정보를 표시합니다" @@ -9097,7 +8446,7 @@ msgstr "콘텐츠를 표시합니다" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9304,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "출처: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "스팸" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "스팸, 과도한 멘션 또는 답글" -======= -msgstr "스팸 또는 기타 기만, 사기 행위" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9477,23 +8813,9 @@ msgstr "나를 위한 추천" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "외설적" +msgstr "외설적<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "일출" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "일몰" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9565,11 +8887,7 @@ msgstr "탭하여 닫기" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "표적 괴롭힘" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9615,18 +8933,8 @@ msgstr "이용약관" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "서비스 이용약관" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "커뮤니티 기준을 위반하는 용어 사용" - -======= ->>>>>>> upstream/main +msgstr "서비스 이용약관<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "텍스트 및 태그" @@ -9675,11 +8983,7 @@ msgid "That's everything!" msgstr "그게 다예요!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "차단을 해제하면 이 계정이 나와 상호작용할 수 있게 됩니다." @@ -9811,17 +9115,12 @@ msgstr "서버에 연결하는 동안 문제가 발생했습니다" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "서버에 연결하는 동안 문제가 발생했습니다. 인터넷 연결을 확인한 후 다시 시도해 주세요." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "알림을 가져오는 동안 문제가 발생했습니다. 다시 시도하려면 이곳을 탭하세요." +msgstr "알림을 가져오는 동안 문제가 발생했습니다. 다시 시도하려면 이곳을 탭하세요.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "게시물을 가져오는 동안 문제가 발생했습니다. 다시 시도하려면 이곳을 탭하세요." @@ -9860,16 +9159,9 @@ msgstr "피드를 업데이트하는 동안 문제가 발생했습니다. 인터 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9897,21 +9189,15 @@ msgstr "애플리케이션에 예기치 않은 문제가 발생했습니다. 이 #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Bluesky에 신규 사용자가 몰리고 있습니다! 최대한 빨리 계정을 활성화하겠습니다." +msgstr "Bluesky에 신규 사용자가 몰리고 있습니다! 최대한 빨리 계정을 활성화하겠습니다.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "내 기본 설정" ->>>>>>> upstream/main +msgstr "내 기본 설정>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10063,13 +9349,9 @@ msgstr "이 리스트는 비어 있습니다." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "이 검토 서비스는 사용할 수 없습니다. 자세한 내용은 아래를 참조하세요. 이 문제가 지속되면 문의해 주세요." +msgstr "이 검토 서비스는 사용할 수 없습니다. 자세한 내용은 아래를 참조하세요. 이 문제가 지속되면 문의해 주세요.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "이 게시물은 <0>{0}에 작성되었다고 주장하지만 Bluesky에서는 <1>{1}에 처음 확인되었습니다." @@ -10187,11 +9469,7 @@ msgstr "스레드 설정" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "위협 또는 선동" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10241,17 +9519,10 @@ msgstr "주제" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "번역" @@ -10270,11 +9541,7 @@ msgstr "인기 동영상" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "분쟁 유발" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10377,22 +9644,13 @@ msgstr "차단 해제" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "계정 차단 해제" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "계정을 차단 해제하시겠습니까?" @@ -10414,16 +9672,8 @@ msgstr "재게시 취소" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "재게시 취소 ({0, plural, other {#개}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "언팔로우" +msgstr "재게시 취소 ({0, plural, other {#개}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} 님을 언팔로우" @@ -10451,32 +9701,18 @@ msgstr "알 수 없는 인증자" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "라벨이 없는 성인 콘텐츠" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "라벨이 없거나, 학대적이거나 동의받지 않은 성인 콘텐츠" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "좋아요 취소" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "좋아요 취소 ({0, plural, other {#개}})" @@ -10587,16 +9823,8 @@ msgstr "리스트를 구독 취소했습니다" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "지원되지 않는 동영상 유형: {mimeType}" +msgstr "지원되지 않는 동영상 유형: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "원치 않는 성적 콘텐츠" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10646,20 +9874,20 @@ msgstr "텍스트 파일 업로드 경로:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "카메라에서 업로드" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "파일에서 업로드" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "보관함에서 업로드" @@ -10672,7 +9900,7 @@ msgstr "이미지 업로드 중…" msgid "Uploading link thumbnail..." msgstr "링크 미리보기 업로드 중…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "동영상 업로드 중…" @@ -10926,7 +10154,7 @@ msgstr "동영상을 찾을 수 없습니다." msgid "Video settings" msgstr "동영상 설정" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "동영상 업로드됨" @@ -10951,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "보기" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0} 님의 아바타 보기" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10977,15 +10209,10 @@ msgstr "자세한 정보를 위해 블로그 글 보기" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "디버그 항목 보기" +msgstr "디버그 항목 보기<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "세부 정보 보기" @@ -11021,10 +10248,6 @@ msgstr "게시물 보기" msgid "View profile" msgstr "프로필 보기" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "아바타 보기" @@ -11068,15 +10291,10 @@ msgstr "내가 뮤트한 계정 보기" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "내 인증 보기" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "내 인증 보기<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "전체 이미지를 봅니다" @@ -11086,24 +10304,16 @@ msgstr "몰입형 모드로 동영상을 봅니다" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "폭력적이거나 위협적인 콘텐츠>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "폭력" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "폭력적이거나 위협적인 콘텐츠" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11253,7 +10463,7 @@ msgstr "죄송하지만 이 리스트를 불러올 수 없습니다. 이 문제 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "죄송하지만 현재 뮤트한 단어를 불러올 수 없습니다. 다시 시도해 주세요." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "죄송하지만 검색을 완료할 수 없습니다. 몇 분 후에 다시 시도해 주세요." @@ -11354,11 +10564,7 @@ msgstr "이의신청하는 이유가 무엇인가요?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "이 대화를 검토해야 하는 이유는 무엇인가요?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11385,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "이 사용자를 검토해야 하는 이유는 무엇인가요?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "이 사용자를 차단하거나 이 대화를 삭제하시겠습니까?" ->>>>>>> upstream/main +msgstr "이 사용자를 차단하거나 이 대화를 삭제하시겠습니까?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11825,11 +11026,7 @@ msgstr "앱 비밀번호로 로그인한 상태입니다. 계정 비활성화를 #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "해당 라벨에 대해 이미 이의를 제기했으며, 현재 검토 팀에서 검토 중입니다." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/ne/messages.po b/src/locale/locales/ne/messages.po index 312457b0e..0bf3b24e2 100644 --- a/src/locale/locales/ne/messages.po +++ b/src/locale/locales/ne/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {अनुगामी} other {अनुगामीह #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {अनुगमन गरिरहेको} other {अनुगमन गरिरहेका}}" +msgstr "{0, plural, one {अनुगमन गरिरहेको} other {अनुगमन गरिरहेका}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {मन पराइएको} other {मन पराइएका}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {पोष्ट} other {पोष्टहरू}}" +msgstr "{0, plural, one {पोष्ट} other {पोष्टहरू}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {उद्धरण} other {उद्धरणहरू}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {पुन: पोष्ट} other {पुन: पोष्टहरू}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {उद्धरण} other {उद्धरणहरू}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {पुन: पोष्ट} other {पुन: पोष्टहरू}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} मा {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "पहुँचयोग्यता" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "पहुँचयोग्यता सेटिङ्स" +msgstr "पहुँचयोग्यता सेटिङ्स<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "खाता" +msgstr "खाता<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "खाता ब्लक गरिएको छ" @@ -661,26 +634,18 @@ msgstr "सूचीद्वारा खाता म्यूट गरिए #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "खाताको विकल्पहरू" +msgstr "खाताको विकल्पहरू<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "खाता छिटो पहुँचबाट हटाइएको छ" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "खाताको ब्लक हटाइएको छ" @@ -770,7 +735,7 @@ msgstr "अर्को खाता थप्नुहोस्" msgid "Add another post" msgstr "अर्को पोष्ट थप्नुहोस्" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "वयस्क सामग्री" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "यी विकल्पहरूमा समावेश नभएको समस्या" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "विरोधी सामाजिक व्यवहार" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "एप पासवर्ड नाम कम्तिमा ४ वर #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "एप पासवर्डहरू" +msgstr "एप पासवर्डहरू<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "एप पासवर्डहरू" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "यो निर्णयको अपील गर्नुहोस्।" +msgstr "यो निर्णयको अपील गर्नुहोस्।<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "रूपरङ्ग" @@ -1307,23 +1242,14 @@ msgstr "डिफल्ट सिफारिस गरिएका फिडह #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0} बाट आर्काइभ गरिएको" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0} बाट आर्काइभ गरिएको" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "आर्काइभ गरिएको पोस्ट" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "जन्मदिन" +msgstr "जन्मदिन<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "ब्लक गर्नुहोस्" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "खाता ब्लक गर्नुहोस्" @@ -1546,15 +1446,8 @@ msgstr "खाताहरू ब्लक गर्नुहोस्" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "ब्लक सूची" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "ब्लक गरियो" @@ -1617,40 +1506,18 @@ msgstr "ब्लक सार्वजनिक हुन्छ। ब्लक #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "ब्लकले तपाईंको खातामा लेबलहरू लागू हुनबाट रोक्दैन, तर यस खाताले तपाईंको थ्रेडहरूमा उत्तर दिन वा तपाईंसँग अन्तरक्रिया गर्न रोक्नेछ।" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "ब्लूस्काई" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "ब्लूस्काईले दाबी गरिएको मितिको प्रामाणिकता पुष्टि गर्न सक्दैन।" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "ब्लग" +msgstr "ब्लकले तपाईंको खातामा लेबलहरू लागू हुनबाट रोक्दैन, तर यस खाताले तपाईंको थ्रेडहरूमा उत्तर दिन वा तपाईंसँग अन्तरक्रिया गर्न रोक्नेछ।<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "ब्लूस्काई" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "ब्लूस्काईले दाबी गरिएको मितिको प्रामाणिकता पुष्टि गर्न सक्दैन।" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "ब्लूस्काई खुला नेटवर्क हो जहाँ तपाईं आफ्नो होस्टिङ प्रदायक छनोट गर्न सक्नुहुन्छ। यदि तपाईं एक विकासकर्ता हुनुहुन्छ भने, तपाईं आफ्नो सर्भर होस्ट गर्न सक्नुहुन्छ।" @@ -1702,13 +1569,9 @@ msgstr "पुस्तकहरू" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "एक्सप्लोर पृष्ठमा थप खाता ब्राउज गर्नुहोस्" @@ -1819,19 +1682,13 @@ msgstr "क्यामेरा" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "पुनः सक्रियता रद्द गर्नुहो #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "खोजी रद्द गर्नुहोस्" +msgstr "खोजी रद्द गर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "ब्लक गरिएको प्रयोगकर्तासँग अन्तरक्रिया गर्न सकिँदैन" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "क्लिप 🐴 क्लोप 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "पासवर्ड अद्यावधिक चेतावनी बन्द गर्नुहोस्" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "जवाफ तयार गर्नुहोस्" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "भिडियो कम्प्रेस गर्दै..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "कोड प्रतिलिपि गर्नुहोस्" +msgstr "कोड प्रतिलिपि गर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID प्रतिलिपि गर्नुहोस्" @@ -2705,7 +2538,7 @@ msgstr "खाता सिर्जना गर्नुहोस्" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "खाता बनाउनुहोस्" @@ -2766,15 +2599,8 @@ msgstr "अनुकूलित" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "यस पोस्टसँग कसले अन्तरक्रिया गर्न सक्छ भन्ने अनुकूलन गर्नुहोस्।" - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "गाढा" @@ -2834,17 +2653,13 @@ msgstr "डिबग प्यानल" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "डिफल्ट" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "इमेल 2FA अक्षम गर्नुहोस्" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "ह्याप्टिक प्रतिक्रिया अक्षम गर्नुहोस्" +msgstr "ह्याप्टिक प्रतिक्रिया अक्षम गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "नयाँ फिडहरू खोज्नुहोस्" msgid "Dismiss" msgstr "रद्द गर्नुहोस्" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "त्रुटि रद्द गर्नुहोस्" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Bluesky डाउनलोड गर्नुहोस्" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR फाइल डाउनलोड गर्नुहोस्" +msgstr "CAR फाइल डाउनलोड गर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "सम्पादन गर्नुहोस्" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "अवतार सम्पादन गर्नुहोस्" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "त्रुटि" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "फाइल बचत गर्दा त्रुटि भयो" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "क्याप्चा प्रतिक्रिया प्राप्त गर्दा त्रुटि।" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "सबै जना" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "अत्यधिक उल्लेखहरू वा उत्तरहरू" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "अत्यधिक वा नचाहिएको सन्देशहरू" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "तपाईंले पछ्याएका प्रयोगकर्ताहरूलाई हटाउनुहोस्" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "फिड" @@ -4164,26 +3946,8 @@ msgstr "समाप्त" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "फिटनेस" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "फिटनेस<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "लचिलो" @@ -4194,16 +3958,7 @@ msgstr "लचिलो" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "अनुसरण गर्नुहोस्" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "अनुसरण गर्नुहोस्" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "पछाडि अनुसरण गर्नुहोस्" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "पछाडि अनुसरण गर्नुहोस्" @@ -4295,13 +4042,9 @@ msgstr "तपाईंले चिनेका अनुसरणकर्त #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "अनुसरण गर्दै" @@ -4309,16 +4052,11 @@ msgstr "अनुसरण गर्दै" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "अनुसरण गर्दै" +msgstr "अनुसरण गर्दै<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0} लाई अनुसरण गर्दै" @@ -4405,15 +4143,8 @@ msgstr "बिर्सनुभयो?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "बारम्बार अवाञ्छित सामग्री पोस्ट गर्दछ" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "आफ्नो प्रोफाइललाई अनुहार दिनुहोस्" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "कानुन वा सेवा सर्तहरूको स्पष्ट उल्लङ्घन" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "आफ्नो प्रोफाइललाई अनुहार दिनुहोस्<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "ह्याप्टिक्स" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "उत्पीडन, ट्रोलिङ, वा असहिष्णुता" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "समस्या भइरहेको छ?" +msgstr "समस्या भइरहेको छ?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "मेरो लागि पोष्ट लुकाउनुहोस्" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "यदि तपाईं आफ्नो ह्यान्डल वा इमेल परिवर्तन गर्न प्रयास गरिरहनु भएको छ भने, निष्क्रिय गर्नु अघि गर्नुहोस्।" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "अवैध र अत्यावश्यक" +msgstr "यदि तपाईं आफ्नो ह्यान्डल वा इमेल परिवर्तन गर्न प्रयास गरिरहनु भएको छ भने, निष्क्रिय गर्नु अघि गर्नुहोस्।<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "चित्र" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "पहिचान वा सम्बन्धितता बारेको झूटा दाबीहरू वा प्रतिरूपण" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "प्रतिरूपण, गलत जानकारी, वा झूटा दाबीहरू" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "अशोभनीय सन्देशहरू वा स्पष्ट लिङ्कहरू" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "खाता मेटाउनको लागि पासवर्ड #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "तपाईंलाई इमेल गरिएका कोड प्रविष्ट गर्नुहोस्" +msgstr "तपाईंलाई इमेल गरिएका कोड प्रविष्ट गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "परस्पर क्रिया सीमित छ" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "अहिले मात्र तपाईं हुनुहुन्छ! माथि खोजेर आफ्नो स्टार्टर प्याकमा थप मानिसहरू थप्नुहोस्।" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "जॉब आईडी: {0}" @@ -5231,17 +4887,13 @@ msgstr "{0} द्वारा लेबल गरिएको।" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "लेखकद्वारा लेबल गरिएको।" +msgstr "लेखकद्वारा लेबल गरिएको।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "लेबलहरू" @@ -5306,17 +4958,9 @@ msgstr "थप जान्नुहोस्" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "ब्लूस्काईबारे थप जान्नुहोस्" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "आफ्नो PDS आफैं होस्ट गर्ने बारे थप जान्नुहोस्।" @@ -5351,15 +4995,10 @@ msgstr "ब्लूस्काईमा सार्वजनिक हुन #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "थप जान्नुहोस्।" @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "यस पोस्टमा रुचिहरू" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "सन्देशहरू" +msgstr "सन्देशहरू<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "भ्रामक खाता" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "भ्रामक पोस्ट" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "मोडरेशन उपकरणहरू" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "मोडरेटरले सामग्रीमा सामान्य चेतावनी सेट गर्ने निर्णय गरेका छन्।" +msgstr "मोडरेटरले सामग्रीमा सामान्य चेतावनी सेट गर्ने निर्णय गरेका छन्।<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "थप फीडहरू" @@ -6047,18 +5652,8 @@ msgstr "मेरो फीडहरू" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "नाम" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "नाम वा विवरणले समुदायका मापदण्डहरू उल्लङ्घन गर्दछ।" - -======= ->>>>>>> upstream/main +msgstr "नाम<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "अहिलेसम्म कुनै रुचिहरू छैन" +msgstr "अहिलेसम्म कुनै रुचिहरू छैन<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} लाई अब अनुसरण गरिरहेको छैन" @@ -6283,7 +5873,7 @@ msgstr "अहिलेसम्म कुनै सन्देश छैन" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "अहिले सम्म कुनै सूचना छैन!" @@ -6337,9 +5927,9 @@ msgstr "कुनै परिणाम भेटिएन" msgid "No results found for \"{query}\"" msgstr "\"{query}\" को लागि कुनै परिणाम भेटिएन" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "{query} को लागि कुनै परिणाम भेटिएन" @@ -6474,15 +6064,8 @@ msgstr "अहिले" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "नग्नता" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "नग्नता वा वयस्क सामग्री जसलाई यथोचित रूपमा लेबल गरिएको छैन" +msgstr "नग्नता<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "ठिक छ" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "हुन्छ" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "इमोजी चयनकर्ता खोल्नुहोस्" @@ -6708,7 +6287,7 @@ msgstr "कम्पोजर खोल्नुहोस्" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "पासवर्ड रिसेट फारम खोल्नुह #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "यो प्रोफाइल खोल्नुहोस्" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "अन्य" @@ -6905,23 +6474,16 @@ msgstr "@{0} लाई अनुसरण गर्ने व्यक्ति" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "पोस्ट" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "पोस्ट" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "सबै पोस्ट गर्नुहोस्" @@ -7206,19 +6768,12 @@ msgstr "पोस्ट मेटियो" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "पोस्ट अपलोड गर्न असफल भयो। कृपया तपाईंको इन्टरनेट कनेक्शन जाँच गर्नुहोस् र पुनः प्रयास गर्नुहोस्।" +msgstr "पोस्ट अपलोड गर्न असफल भयो। कृपया तपाईंको इन्टरनेट कनेक्शन जाँच गर्नुहोस् र पुनः प्रयास गर्नुहोस्।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "गोपनीयता नीति" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "भिडियो प्रशोधन हुँदैछ।" @@ -7382,19 +6937,12 @@ msgstr "प्रोफाइल अद्यावधिक गरियो।" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "सार्वजनिक" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "उद्धरण पोस्टहरू अक्षम गरिए #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "उद्धरण।" +msgstr "उद्धरण।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "यस पोस्टका उद्धरण।" @@ -7553,12 +7097,12 @@ msgstr "ब्लूस्काई सेवा सर्तहरू पढ् msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "संलग्नक हटाउनुहोस्" msgid "Remove Avatar" msgstr "अवतार हटाउनुहोस्" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "ब्यानर हटाउनुहोस्" @@ -7824,17 +7368,13 @@ msgstr "उत्तरहरू निष्क्रिय गरियो" msgid "Replies to this post are disabled." msgstr "यो पोस्टका उत्तरहरू निष्क्रिय गरिएका छन्।" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "उत्तर दिनुहोस्" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "तपाईँद्वारा पुनःपोस्ट गरि #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "यस पोस्टका पुनःपोस्टहरू" @@ -8074,17 +7610,13 @@ msgstr "प्रारम्भिक अवस्थालाई रिसे #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "पासवर्ड रिसेट गर्नुहोस्" +msgstr "पासवर्ड रिसेट गर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "विज्ञान" +msgstr "विज्ञान<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "\"{query}\" को लागि खोज्नुहोस्" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "“{searchText}” को लागि खोज्नुहोस्" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF हरूको लागि खोज्नुहोस्।" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "जन्म मिति सेट गर्नुहोस्" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "नयाँ पासवर्ड सेट गर्नुहोस्" +msgstr "नयाँ पासवर्ड सेट गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "तपाईंको खाता सेट गर्नुहोस्" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "उत्तरहरू देखाउनुहोस्" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "सबैको लागि उत्तर देखाउनुहोस्" @@ -8910,13 +8423,9 @@ msgstr "चेतावनी देखाउनुहोस्" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "चेतावनी देखाउनुहोस् र फीडबाट फिल्टर गर्नुहोस्" +msgstr "चेतावनी देखाउनुहोस् र फीडबाट फिल्टर गर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "स्प्याम" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "स्प्याम; अत्यधिक उल्लेखहरू वा उत्तरहरू" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "तपाईंका लागि सुझाव गरिएको" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "सुझावात्मक" +msgstr "सुझावात्मक<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "नियमहरू" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "सेवाका नियमहरू" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "प्रयोग गरिएका नियमहरूले समुदायको मापदण्ड उल्लङ्घन गरेका छन्" - -======= ->>>>>>> upstream/main +msgstr "सेवाका नियमहरू<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "पाठ र टैगहरू" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "खाता अनब्लक गरेपछि तपाईं सँग अन्तर्क्रिया गर्न सक्षम हुनेछ।" @@ -9646,17 +9115,12 @@ msgstr "सर्भरलाई सम्पर्क गर्न समस् msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "सर्भरलाई सम्पर्क गर्न समस्या आयो, कृपया आफ्नो इन्टरनेट जडान जाँच गर्नुहोस् र पुन: प्रयास गर्नुहोस्।" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "सूचनाहरू प्राप्त गर्न समस्या आयो। पुन: प्रयास गर्न यहाँ ट्याप गर्नुहोस्।" +msgstr "सूचनाहरू प्राप्त गर्न समस्या आयो। पुन: प्रयास गर्न यहाँ ट्याप गर्नुहोस्।<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "पोस्टहरू प्राप्त गर्न समस्या आयो। पुन: प्रयास गर्न यहाँ ट्याप गर्नुहोस्।" @@ -9695,16 +9159,9 @@ msgstr "तपाईंको फीडहरू अपडेट गर्न #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "अनुप्रयोगमा अप्रत्याशित स #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "ब्लूस्काईमा नयाँ प्रयोगकर्ताहरूको भीड भएको छ! हामी तपाईंको खाता सकेसम्म चाँडो सक्रिय गर्नेछौं।" +msgstr "ब्लूस्काईमा नयाँ प्रयोगकर्ताहरूको भीड भएको छ! हामी तपाईंको खाता सकेसम्म चाँडो सक्रिय गर्नेछौं।<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "यो मोडरेशन सेवा उपलब्ध छैन। थप विवरणको लागि तल हेर्नुहोस्। यदि यो समस्या जारी रहन्छ भने, हामीलाई सम्पर्क गर्नुहोस्।" +msgstr "यो मोडरेशन सेवा उपलब्ध छैन। थप विवरणको लागि तल हेर्नुहोस्। यदि यो समस्या जारी रहन्छ भने, हामीलाई सम्पर्क गर्नुहोस्।<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "यो पोस्ट <0>{0} मा सिर्जना गरिएको दावी गर्दछ, तर पहिलो पटक Bluesky द्वारा <1>{1} मा देखिएको थियो।" @@ -10071,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "अनुवाद गर्नुहोस्" @@ -10203,22 +9644,13 @@ msgstr "ब्लक हटाउनुहोस्" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "खाता ब्लक हटाउनुहोस्" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "खाता ब्लक हटाउन चाहानुहुन्छ?" @@ -10240,16 +9672,8 @@ msgstr "पुनःपोस्टलाई रद्द गर्नुहो #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "अनफोलो गर्नुहोस्" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} लाई अनफोलो गर्नुहोस्" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "सूचीबाट सदस्यता समाप्त गरि #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "अवांछनीय यौन सामग्री" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "टेक्स्ट फाइल अपलोड गर्नुहो #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "क्यामेरा बाट अपलोड गर्नुहोस्" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "फाइल बाट अपलोड गर्नुहोस्" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "लाइब्रेरी बाट अपलोड गर्नुहोस्" @@ -10492,7 +9900,7 @@ msgstr "तस्विरहरू अपलोड गर्दै..." msgid "Uploading link thumbnail..." msgstr "लिंक थम्बनेल अपलोड गर्दै..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "भिडियो अपलोड गर्दै..." @@ -10746,7 +10154,7 @@ msgstr "भिडियो फेला पारिएन।" msgid "Video settings" msgstr "भिडियो सेटिङ्गहरू" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "भिडियो अपलोड गरियो" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0} को अवतार हेर्नुहोस्" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "अधिक जानकारीको लागि ब्लगपो #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "डिबग प्रविष्टि हेर्नुहोस्" +msgstr "डिबग प्रविष्टि हेर्नुहोस्<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "विवरण हेर्नुहोस्" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "प्रोफाइल हेर्नुहोस्" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "अवतार हेर्नुहोस्" @@ -10888,15 +10291,10 @@ msgstr "तपाईंका म्युट गरिएको खाता #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "हामीलाई खेद छ, तर हामी यो सू msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "हामीलाई खेद छ, तर हामी तपाईंका म्यूट गरिएका शब्दहरू लोड गर्न असमर्थ भयौं। कृपया पुन: प्रयास गर्नुहोस्।" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "हामीलाई खेद छ, तर तपाईंको खोजी पूरा गर्न सकिएन। कृपया केही मिनेटमा पुन: प्रयास गर्नुहोस्।" @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "यो प्रयोगकर्ता किन समीक्षा गर्नुपर्छ?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/nl/messages.po b/src/locale/locales/nl/messages.po index 8f88835e6..927d7c117 100644 --- a/src/locale/locales/nl/messages.po +++ b/src/locale/locales/nl/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {volger} other {volgers}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {volgend} other {volgend}}" +msgstr "{0, plural, one {volgend} other {volgend}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {vind-ik-leuk} other {vind-ik-leuks}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {bericht} other {berichten}}" +msgstr "{0, plural, one {bericht} other {berichten}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citaat} other {citaten}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {herplaatsing} other {herplaatsingen}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citaat} other {citaten}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {herplaatsing} other {herplaatsingen}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} om {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Toegankelijkheid" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Toegankelijkheidsinstellingen" +msgstr "Toegankelijkheidsinstellingen<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account" +msgstr "Account<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Account geblokkeerd" @@ -661,26 +634,18 @@ msgstr "Account genegeerd door lijst" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Accountopties" +msgstr "Accountopties<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Account verwijderd uit snelle toegang" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Account gedeblokkeerd" @@ -770,7 +735,7 @@ msgstr "Nog een account toevoegen" msgid "Add another post" msgstr "Nog een bericht toevoegen" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Inhoud voor volwassenen" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Een probleem niet vermeld in deze opties" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Nieuw: verificatie op Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Asociaal gedrag" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Nieuw: verificatie op Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "App-wachtwoordnamen moeten minimaal 4 tekens lang zijn" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App-wachtwoorden" +msgstr "App-wachtwoorden<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "App-wachtwoorden" @@ -1283,19 +1225,12 @@ msgstr "Bezwaar maken tegen schorsing" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Bezwaar maken tegen deze beslissing" +msgstr "Bezwaar maken tegen deze beslissing<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Weergave" @@ -1307,23 +1242,14 @@ msgstr "Standaard aanbevolen feeds gebruiken" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Gearchiveerd van {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Gearchiveerd van {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Gearchiveerd bericht" @@ -1392,18 +1318,11 @@ msgstr "Onderwerp voor algoritme toewijzen" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Verjaardag" +msgstr "Verjaardag<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blokkeren" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Account blokkeren" @@ -1547,15 +1446,8 @@ msgstr "Accounts blokkeren" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokkeren en verwijderen" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Dit gesprek blokkeren en/of verwijderen" +msgstr "Blokkeren en verwijderen<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blokkeerlijst" @@ -1575,18 +1467,14 @@ msgstr "Gebruiker blokkeren" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Gebruiker blokkeren" +msgstr "Gebruiker blokkeren<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Geblokkeerd" @@ -1618,40 +1506,18 @@ msgstr "Blokkeren is openbaar. Geblokkeerde accounts kunnen niet reageren op jou #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blokkeren voorkomt niet dat er labels op jouw account worden toegepast, maar het zorgt er wel voor dat dit account niet meer op jouw gesprekken kan reageren en niet meer met je kan communiceren." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky kan de echtheid van de geclaimde datum niet bevestigen." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blokkeren voorkomt niet dat er labels op jouw account worden toegepast, maar het zorgt er wel voor dat dit account niet meer op jouw gesprekken kan reageren en niet meer met je kan communiceren.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky kan de echtheid van de geclaimde datum niet bevestigen." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky is een open netwerk waar je jouw hostingprovider kunt kiezen. Als je een ontwikkelaar bent kun je je eigen server hosten." @@ -1703,13 +1569,9 @@ msgstr "Boeken" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Blader door meer accounts op de pagina Verkennen" @@ -1820,19 +1682,13 @@ msgstr "Camera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Heractivering annuleren en afmelden" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Zoeken annuleren" +msgstr "Zoeken annuleren<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Kan geen interactie hebben met een geblokkeerde gebruiker" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Chatverzoeken" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Klik 🐴 klak 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Sluit waarschuwing voor bijwerken wachtwoord" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2304,7 +2142,7 @@ msgstr "Je kunt berichten opstellen met een lengte van maximaal {0, plural, othe msgid "Compose reply" msgstr "Reactie opstellen" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Video comprimeren..." @@ -2534,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Code kopiëren" +msgstr "Code kopiëren<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID kopiëren" @@ -2706,7 +2538,7 @@ msgstr "Account aanmaken" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Een account aanmaken" @@ -2767,15 +2599,8 @@ msgstr "Gepersonaliseerd" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Aanpassingsopties" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Pas aan wie kan reageren op dit bericht." +msgstr "Aanpassingsopties<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Past je Bluesky-ervaring aan" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Donker" @@ -2835,17 +2653,13 @@ msgstr "Debugpaneel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Standaard" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Standaardpictogrammen" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Uitschakelen e-mail 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Uitschakelen voelbare feedback" +msgstr "Uitschakelen voelbare feedback<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Ontdek nieuwe feeds" msgid "Dismiss" msgstr "Sluiten" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Fout negeren" @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Bluesky downloaden" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR-bestand downloaden" +msgstr "CAR-bestand downloaden<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Bewerken" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Avatar bewerken" @@ -3627,7 +3423,7 @@ msgstr "Opent volledig scherm" msgid "Entertainment" msgstr "Entertainment" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Fout" @@ -3648,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Er is een fout opgetreden bij het opslaan van het bestand" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Fout bij ontvangen van captcha-antwoord." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Fout: {error}" @@ -3674,19 +3470,8 @@ msgstr "Iedereen" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Overmatig veel vermeldingen of antwoorden" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Overmatige of ongewenste privéberichten" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Gebruikers uitsluiten die je volgt" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Feed" @@ -4165,26 +3946,8 @@ msgstr "Voltooien" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexibel" @@ -4195,16 +3958,7 @@ msgstr "Flexibel" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Volgen" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Volgen" @@ -4247,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Terugvolgen" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Terugvolgen" @@ -4296,13 +4042,9 @@ msgstr "Volgers die je kent" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Volgend" @@ -4310,16 +4052,11 @@ msgstr "Volgend" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Volgend" +msgstr "Volgend<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Volgt {0}" @@ -4406,15 +4143,8 @@ msgstr "Vergeten?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publiceert vaak ongewenste inhoud" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Geef je profiel een gezicht" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Duidelijke overtredingen van de wet of servicevoorwaarden" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Geef je profiel een gezicht<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Haptische feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Pesterijen, trolling of intolerantie" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "Heb je een code? <0>Klik hier." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Heb je problemen?" +msgstr "Heb je problemen?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Aanpassingsopties verbergen" +msgstr "Aanpassingsopties verbergen<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Bericht voor mij verbergen" @@ -4985,17 +4677,9 @@ msgstr "Als je een ontwikkelaar bent, kun je je eigen server hosten." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Als je jouw handle of e-mailadres probeert te wijzigen, doe dit dan voordat je deactiveert." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Illegaal en dringend" +msgstr "Als je jouw handle of e-mailadres probeert te wijzigen, doe dit dan voordat je deactiveert.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Afbeelding" @@ -5015,29 +4699,15 @@ msgstr "Afbeelding opgeslagen" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Nabootsing van identiteit of valse beweringen over identiteit of affiliatie" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Nabootsing van identiteit, verkeerde informatie of valse beweringen" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Ongepaste privéberichten of expliciete links" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Vul wachtwoord in voor accountverwijdering" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Vul de code in die naar je is gemaild" +msgstr "Vul de code in die naar je is gemaild<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interactie beperkt" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Jij bent nu nog de enige! Voeg meer personen toe aan je startpakket door hierboven te zoeken." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Taak-ID: {0}" @@ -5232,17 +4887,13 @@ msgstr "Gelabeld door {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Gelabeld door de auteur." +msgstr "Gelabeld door de auteur.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Labels" @@ -5307,17 +4958,9 @@ msgstr "Leer meer" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Leer meer over Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Leer meer over het zelf hosten van je PDS." @@ -5352,15 +4995,10 @@ msgstr "Leer meer over wat openbaar is op Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Leer meer." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Leuk" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Leuk ({0, plural, one {# vind-ik-leuk} other {# vind-ik-leuks}})" @@ -5491,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Vind-ik-leuks op dit bericht" @@ -5801,44 +5431,23 @@ msgstr "Berichtopties" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Privéberichten" +msgstr "Privéberichten<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Misleidend account" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Misleidend bericht" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5899,15 +5508,10 @@ msgstr "Moderatiehulpmiddelen" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "De moderator heeft ervoor gekozen om een algemene waarschuwing in te stellen voor de inhoud." +msgstr "De moderator heeft ervoor gekozen om een algemene waarschuwing in te stellen voor de inhoud.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Meer feeds" @@ -6048,18 +5652,8 @@ msgstr "Mijn feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Naam" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Naam of omschrijving schendt gemeenschapsnormen" - -======= ->>>>>>> upstream/main +msgstr "Naam<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6263,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Nog geen vind-ik-leuks" +msgstr "Nog geen vind-ik-leuks<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Je volgt {0} niet meer" @@ -6284,7 +5873,7 @@ msgstr "Nog geen privéberichten" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Nog geen meldingen!" @@ -6338,9 +5927,9 @@ msgstr "Geen resultaten gevonden" msgid "No results found for \"{query}\"" msgstr "Geen resultaten gevonden voor \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Geen resultaten gevonden voor {query}" @@ -6475,15 +6064,8 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Bloot" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Bloot of inhoud voor volwassenen die niet als zodanig is gelabeld" +msgstr "Bloot<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6504,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Oké" @@ -6609,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Menu openen" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Emoji-kiezer openen" @@ -6709,7 +6287,7 @@ msgstr "Opent composer" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Opent de emoji-kiezer" @@ -6749,15 +6327,10 @@ msgstr "Opent formulier om het wachtwoord opnieuw in te stellen" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Opent dit profiel" @@ -6791,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Anders" @@ -6906,23 +6474,16 @@ msgstr "Personen die @{0} volgen" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7179,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Bericht" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Plaatsen" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Alles plaatsen" @@ -7207,19 +6768,12 @@ msgstr "Bericht verwijderd" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Bericht kan niet worden geüpload. Controleer je internetverbinding en probeer het opnieuw." +msgstr "Bericht kan niet worden geüpload. Controleer je internetverbinding en probeer het opnieuw.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7355,7 +6909,7 @@ msgstr "Privacybeleid" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Video verwerken..." @@ -7383,19 +6937,12 @@ msgstr "Profiel bijgewerkt" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Openbaar" @@ -7409,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7487,13 +7034,9 @@ msgstr "Citaatberichten uitgeschakeld" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citaten" +msgstr "Citaten<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citaten van dit bericht" @@ -7554,12 +7097,12 @@ msgstr "Lees de Bluesky-servicevoorwaarden" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7650,8 +7193,8 @@ msgstr "Bijlage verwijderen" msgid "Remove Avatar" msgstr "Avatar verwijderen" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Banner verwijderen" @@ -7825,17 +7368,13 @@ msgstr "Antwoorden uitgeschakeld" msgid "Replies to this post are disabled." msgstr "Antwoorden op dit bericht zijn uitgeschakeld." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Reageren" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7996,13 +7535,9 @@ msgstr "Herplaatst door jou" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Herplaatsingen van dit bericht" @@ -8075,17 +7610,13 @@ msgstr "Introductie-status opnieuw instellen" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Wachtwoord opnieuw instellen" +msgstr "Wachtwoord opnieuw instellen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8243,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wetenschap" +msgstr "Wetenschap<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8300,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Zoeken naar \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Zoeken naar \"{searchText}\"" @@ -8329,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF's zoeken" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8629,19 +8157,12 @@ msgstr "Geboortedatum instellen" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Nieuw wachtwoord instellen" +msgstr "Nieuw wachtwoord instellen<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Stel je account in" @@ -8793,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8883,15 +8400,10 @@ msgstr "Antwoorden tonen" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Reactie voor iedereen tonen" @@ -8911,13 +8423,9 @@ msgstr "Waarschuwing tonen" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Waarschuwing en filter uit feeds tonen" +msgstr "Waarschuwing en filter uit feeds tonen<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8938,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9145,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; overmatig veel vermeldingen of reacties" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9317,23 +8813,9 @@ msgstr "Aanbevolen voor jou" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestief" +msgstr "Suggestief<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9451,18 +8933,8 @@ msgstr "Voorwaarden" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Servicevoorwaarden" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "De gebruikte termen schenden gemeenschapsnormen" - -======= ->>>>>>> upstream/main +msgstr "Servicevoorwaarden<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Tekst en tags" @@ -9511,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Het account kan met je communiceren na het deblokkeren." @@ -9647,17 +9115,12 @@ msgstr "Er is een probleem opgetreden bij het verbinden met de server" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Er is een probleem opgetreden bij het verbinden met de server. Controleer je internetverbinding en probeer het opnieuw." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Er is een probleem opgetreden bij het ophalen van meldingen. Tik hier om het opnieuw te proberen." +msgstr "Er is een probleem opgetreden bij het ophalen van meldingen. Tik hier om het opnieuw te proberen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Er is een probleem opgetreden bij het ophalen van berichten. Tik hier om het opnieuw te proberen." @@ -9696,16 +9159,9 @@ msgstr "Er is een probleem opgetreden bij het bijwerken van je feeds. Controleer #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9733,19 +9189,14 @@ msgstr "Er is een onverwacht probleem opgetreden in de applicatie. Laat het ons #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Er is een stormloop van nieuwe gebruikers naar Bluesky! We activeren je account zo snel mogelijk." +msgstr "Er is een stormloop van nieuwe gebruikers naar Bluesky! We activeren je account zo snel mogelijk.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9898,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Deze moderatieservice is niet beschikbaar. Zie hieronder voor meer details. Neem contact met ons op als dit probleem zich blijft voordoen." +msgstr "Deze moderatieservice is niet beschikbaar. Zie hieronder voor meer details. Neem contact met ons op als dit probleem zich blijft voordoen.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Dit bericht beweert te zijn gemaakt op <0>{0}, maar werd voor het eerst gezien door Bluesky op <1>{1}." @@ -10072,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Vertalen" @@ -10204,22 +9644,13 @@ msgstr "Deblokkeren" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Account deblokkeren" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Account deblokkeren?" @@ -10241,16 +9672,8 @@ msgstr "Herplaatsen ongedaan maken" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Ontvolgen" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} ontvolgen" @@ -10282,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10408,16 +9823,8 @@ msgstr "Uitgeschreven voor lijst" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Ongewenste seksuele inhoud" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10467,20 +9874,20 @@ msgstr "Upload een tekstbestand naar:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Uploaden vanaf camera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Uploaden vanuit bestanden" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Uploaden vanuit bibliotheek" @@ -10493,7 +9900,7 @@ msgstr "Afbeeldingen uploaden..." msgid "Uploading link thumbnail..." msgstr "Linkminiatuur uploaden..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Video uploaden..." @@ -10747,7 +10154,7 @@ msgstr "Video niet gevonden." msgid "Video settings" msgstr "Video-instellingen" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video geüpload" @@ -10772,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Avatar van {0} bekijken" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10798,15 +10209,10 @@ msgstr "Bekijk blogpost voor meer details" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-item bekijken" +msgstr "Debug-item bekijken<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Details bekijken" @@ -10842,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Profiel bekijken" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Bekijk de avatar" @@ -10889,15 +10291,10 @@ msgstr "Je genegeerde accounts bekijken" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10911,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11069,7 +10463,7 @@ msgstr "Het spijt ons, maar we kunnen deze lijst niet ophalen. Neem contact op m msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Het spijt ons, maar we kunnen je genegeerde woorden op dit moment niet laden. Probeer het opnieuw." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Het spijt ons, maar je zoekopdracht kan niet worden voltooid. Probeer het over een paar minuten opnieuw." @@ -11197,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Waarom moet deze gebruiker worden beoordeeld?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/pl/messages.po b/src/locale/locales/pl/messages.po index 6ada1f851..d953ef71d 100644 --- a/src/locale/locales/pl/messages.po +++ b/src/locale/locales/pl/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {obserwujący} other {obserwujących}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {obserwowany} other {obserwowanych}}" +msgstr "{0, plural, one {obserwowany} other {obserwowanych}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {polubienie} few {polubienia} other {polubień}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {wpis} few {wpisy} other {wpisów}}" +msgstr "{0, plural, one {wpis} few {wpisy} other {wpisów}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {cytat} few {cytaty} other {cytatów}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repost} few {reposty} other {repostów}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {cytat} few {cytaty} other {cytatów}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repost} few {reposty} other {repostów}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} o {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Ułatwienia dostępu" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ustawienia ułatwień dostępu" +msgstr "Ustawienia ułatwień dostępu<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto" +msgstr "Konto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Konto zostało zablokowane" @@ -661,26 +634,18 @@ msgstr "Konto zostało wyciszone za pomocą listy" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Ustawienia konta" +msgstr "Ustawienia konta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Konto zostało usunięte z szybkiego dostępu" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Konto zostało odblokowane" @@ -770,7 +735,7 @@ msgstr "Dodaj inne konto" msgid "Add another post" msgstr "Dodaj inny wpis" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Treści dla dorosłych" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Inny problem" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Zachowania antyspołeczne" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Nazwy haseł aplikacji muszą składać się z co najmniej 4 znaków" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Hasła aplikacji" +msgstr "Hasła aplikacji<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Hasła aplikacji" @@ -1283,19 +1225,12 @@ msgstr "Zawieszenie odwołania" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Odwołaj się od tej decyzji" +msgstr "Odwołaj się od tej decyzji<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Wygląd" @@ -1307,23 +1242,14 @@ msgstr "Zastosuj domyślne kanały polecane" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Archiwum z dnia {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Archiwum z dnia {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Wpis został zarchiwizowany" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Data urodzenia" +msgstr "Data urodzenia<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blokuj" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blokuj konto" @@ -1546,15 +1446,8 @@ msgstr "Blokuj konta" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Zablokuj i usuń" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Zablokuj i/lub usuń tę rozmowę" +msgstr "Zablokuj i usuń<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blokuj listę" @@ -1574,18 +1467,14 @@ msgstr "Zablokuj osobę" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Zablokuj osobę" +msgstr "Zablokuj osobę<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Zablokowane" @@ -1617,40 +1506,18 @@ msgstr "Blokowanie jest publiczne. Zablokowane konta nie mogą komentować twoic #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blokowanie nie przeszkodzi w umieszczaniu ostrzeżeń na twoim koncie, ale uniemożliwi komentowanie twoich wpisów lub wchodzenie z tobą w interakcje." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky nie może potwierdzić autentyczności podanej daty." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blokowanie nie przeszkodzi w umieszczaniu ostrzeżeń na twoim koncie, ale uniemożliwi komentowanie twoich wpisów lub wchodzenie z tobą w interakcje.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky nie może potwierdzić autentyczności podanej daty." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky to otwarta sieć, w której możesz wybrać swojego dostawcę hostingu. Jeśli jesteś deweloperem, możesz hostować własny serwer." @@ -1702,13 +1569,9 @@ msgstr "Książki" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Wyświetl więcej kont na stronie Eksploruj" @@ -1819,19 +1682,13 @@ msgstr "Aparat" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "Anuluj reaktywację i wyloguj się" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Anuluj wyszukiwanie" +msgstr "Anuluj wyszukiwanie<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Nie można wchodzić w interakcje z zablokowaną osobą" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Klip 🐴 klop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Zamyka ostrzeżenie o aktualizacji hasła" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Skomentuj" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Kompresowanie wideo..." @@ -2533,17 +2372,11 @@ msgstr "Skopiuj DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiuj kod" +msgstr "Kopiuj kod<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopiuj DID" @@ -2705,7 +2538,7 @@ msgstr "Utwórz konto" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Utwórz konto" @@ -2766,15 +2599,8 @@ msgstr "Niestandardowe" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Dostosuj, kto może wchodzić w interakcje z tym wpisem." +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Dostosowuje twoje doświadczenie w Bluesky" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Ciemny" @@ -2834,17 +2653,13 @@ msgstr "Panel debugowania" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Domyślny" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "Domyślne ikony" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Wyłącz uwierzytelnianie dwuskładnikowe przez email" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Wyłącz haptykę" +msgstr "Wyłącz haptykę<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Odkryj nowe kanały" msgid "Dismiss" msgstr "Pomiń" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Pomiń błąd" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Pobierz Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Pobierz plik CAR" +msgstr "Pobierz plik CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Edytuj" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Edytuj zdjęcie profilowe" @@ -3626,7 +3423,7 @@ msgstr "Przechodzi do trybu pełnoekranowego" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Błąd" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Wystąpił błąd podczas zapisywania pliku" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Błąd podczas odbierania odpowiedzi captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Każdy" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Nadmierne wzmianki lub komentarze" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Nadmierne lub niechciane wiadomości" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Wyklucz obserwowane osoby" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Kanał" @@ -4164,26 +3946,8 @@ msgstr "Ukończ" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Aktywność fizyczna" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Aktywność fizyczna<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Uniwersalne" @@ -4194,16 +3958,7 @@ msgstr "Uniwersalne" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Obserwuj" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Obserwuj" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Również obserwuj" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Również obserwuj" @@ -4295,13 +4042,9 @@ msgstr "Obserwujący, których znasz" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Obserwujesz" @@ -4309,16 +4052,11 @@ msgstr "Obserwujesz" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Obserwujesz" +msgstr "Obserwujesz<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Obserwowani {0}" @@ -4405,15 +4143,8 @@ msgstr "Nie pamiętasz?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Często publikuje niechciane treści" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Zmień wygląd swojego profilu" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Rażące naruszenie prawa lub warunków korzystania z serwisu" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Zmień wygląd swojego profilu<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Haptyka" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Prześladowanie, trolling lub nietolerancja" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Masz problem?" +msgstr "Masz problem?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ukryj wpis dla mnie" @@ -4984,17 +4677,9 @@ msgstr "Jeśli jesteś deweloperem, możesz hostować własny serwer." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Jeśli próbujesz zmienić swoją nazwę lub adres email, zrób to przed dezaktywacją." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Nielegalne i pilne" +msgstr "Jeśli próbujesz zmienić swoją nazwę lub adres email, zrób to przed dezaktywacją.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Zdjęcie" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Podszywanie się lub fałszywe oświadczenia dotyczące tożsamości lub przynależności" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Podszywanie się, dezinformacja lub nieprawdziwe treści" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Nieodpowiednie wiadomości lub nieprzyzwoite linki" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Wprowadź hasło, aby usunąć konto" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Wprowadź kod, który został wysłany na twój adres email" +msgstr "Wprowadź kod, który został wysłany na twój adres email<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interakcje są ograniczone" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "W tej chwili jesteś tylko ty! Dodaj więcej osób do swojego pakietu startowego, wyszukując powyżej." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID: {0}" @@ -5231,17 +4887,13 @@ msgstr "Oznaczone przez {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Oznaczone przez autora." +msgstr "Oznaczone przez autora.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Ostrzeżenia" @@ -5306,17 +4958,9 @@ msgstr "Dowiedz się więcej" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Dowiedz się więcej o Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Dowiedz się więcej o samodzielnym hostingu PDS." @@ -5351,15 +4995,10 @@ msgstr "Dowiedz się więcej o tym, co jest publiczne na Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Dowiedz się więcej." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Polub" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Polub ({0, plural, one {# polubienie} few {# polubienia} other {# polubień}})" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Polubienia tego wpisu" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Wiadomości" +msgstr "Wiadomości<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Konto wprowadzające w błąd" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Wpis wprowadzający w błąd" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Narzędzia moderacji" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderator postanowił ustawić ogólne ostrzeżenie dotyczące zawartości." +msgstr "Moderator postanowił ustawić ogólne ostrzeżenie dotyczące zawartości.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Więcej kanałów" @@ -6047,18 +5652,8 @@ msgstr "Moje kanały" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nazwa" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nazwa lub opis naruszają standardy społeczności" +msgstr "Nazwa<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Brak polubień" +msgstr "Brak polubień<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Już nie obserwujesz {0}" @@ -6283,7 +5873,7 @@ msgstr "Brak wiadomości" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Brak powiadomień!" @@ -6337,9 +5927,9 @@ msgstr "Nie znaleziono żadnych wyników" msgid "No results found for \"{query}\"" msgstr "Nie znaleziono żadnych wyników dla \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Nie znaleziono żadnych wyników dla {query}" @@ -6474,15 +6064,8 @@ msgstr "Teraz" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nagość" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nagość lub treści dla dorosłych nieoznaczone jako takie" +msgstr "Nagość<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okej" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Otwórz menu" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Wybierz emoji" @@ -6708,7 +6287,7 @@ msgstr "Otwiera kompozytor wpisu" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Otwiera selektor emoji" @@ -6748,15 +6327,10 @@ msgstr "Zmień hasło" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Otwiera ten profil" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Inne" @@ -6905,23 +6474,16 @@ msgstr "Osoby obserwujące @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Opublikuj" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Opublikuj" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Opublikuj wszystko" @@ -7206,19 +6768,12 @@ msgstr "Wpis usunięty" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Nie udało się opublikować wpisu. Sprawdź swoje połączenie internetowe i spróbuj ponownie." +msgstr "Nie udało się opublikować wpisu. Sprawdź swoje połączenie internetowe i spróbuj ponownie.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Wpis został usunięty" @@ -7354,7 +6909,7 @@ msgstr "Polityka prywatności" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Przetwarzanie wideo..." @@ -7382,19 +6937,12 @@ msgstr "Profil został zaktualizowany" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Publiczne" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Publiczne listy do wykorzystania w kanałach." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Cytowanie wpisów zostało wyłączone" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Cytaty" +msgstr "Cytaty<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Cytowania tego wpisu" @@ -7553,12 +7097,12 @@ msgstr "Zapoznaj się z Regulaminem Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Usuń załącznik" msgid "Remove Avatar" msgstr "Usuń zdjęcie profilowe" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Usuń tło profilu" @@ -7824,17 +7368,13 @@ msgstr "Komentarze zostały wyłączone" msgid "Replies to this post are disabled." msgstr "Komentarze do tego wpisu są wyłączone." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Skomentuj" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Skomentuj ({0, plural, one {# komentarz} few {# komentarze} other {# komentarzy}})" @@ -7995,13 +7535,9 @@ msgstr "Repostowane przez ciebie" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Reposty tego wpisu" @@ -8074,17 +7610,13 @@ msgstr "Zacznij od nowa" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Zresetuj hasło" +msgstr "Zresetuj hasło<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Nauka" +msgstr "Nauka<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Szukaj \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Szukaj \"{searchText}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Szukaj GIF-ów" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Ustaw datę urodzenia" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ustaw nowe hasło" +msgstr "Ustaw nowe hasło<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Skonfiguruj konto" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Pokaż komentarze" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Pokaż komentarze jako" +msgstr "Pokaż komentarze jako<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Pokaż komentarz każdemu" @@ -8910,13 +8423,9 @@ msgstr "Pokaż ostrzeżenie" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Pokaż ostrzeżenie i odfiltruj z kanałów" +msgstr "Pokaż ostrzeżenie i odfiltruj z kanałów<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Pokazuje informacje o momencie utworzenia tego wpisu" @@ -8937,7 +8446,7 @@ msgstr "Pokazuje zawartość" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Źródło: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; nadmierna liczba wzmianek lub komentarzy" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Proponowane dla ciebie" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestywne" +msgstr "Sugestywne<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Regulamin" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Regulamin" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Używane określenia naruszają standardy społeczności" +msgstr "Regulamin<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Tekst i tagi" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "To wszystko!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "To konto będzie mogło wchodzić z tobą w interakcje po odblokowaniu." @@ -9646,17 +9115,12 @@ msgstr "Wystąpił problem podczas łączenia z serwerem" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Wystąpił problem podczas łączenia z serwerem, sprawdź połączenie internetowe i spróbuj ponownie." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Wystąpił problem podczas wczytywania powiadomień. Kliknij tutaj, aby spróbować ponownie." +msgstr "Wystąpił problem podczas wczytywania powiadomień. Kliknij tutaj, aby spróbować ponownie.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Wystąpił problem podczas wczytywania wpisów. Kliknij tutaj, aby spróbować ponownie." @@ -9695,16 +9159,9 @@ msgstr "Wystąpił problem podczas aktualizacji kanałów, sprawdź połączenie #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "Wystąpił nieoczekiwany błąd w aplikacji. Daj nam znać, jeśli tak s #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Do Bluesky dołączyło wiele nowych osób! Twoje konto zostanie aktywowane tak szybko, jak to możliwe." +msgstr "Do Bluesky dołączyło wiele nowych osób! Twoje konto zostanie aktywowane tak szybko, jak to możliwe.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "Ta lista jest pusta." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Ta usługa moderacji jest niedostępna. Więcej informacji znajduje się poniżej. Jeśli problem będzie się powtarzał, skontaktuj się z nami." +msgstr "Ta usługa moderacji jest niedostępna. Więcej informacji znajduje się poniżej. Jeśli problem będzie się powtarzał, skontaktuj się z nami.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Ten wpis został utworzony <0>{0}, ale po raz pierwszy pojawił się na Bluesky <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "Temat" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Przetłumacz" @@ -10203,22 +9644,13 @@ msgstr "Odblokuj" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Odblokuj konto" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Odblokować konto?" @@ -10240,16 +9672,8 @@ msgstr "Cofnij repost" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Cofnij repost ({0, plural, one {# repost} few {# reposty} other {# repostów}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Nie obserwuj" +msgstr "Cofnij repost ({0, plural, one {# repost} few {# reposty} other {# repostów}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Nie obserwuj {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Nie lubię" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Nie lubię ({0, plural, one {# polubienie} few {# polubienia} other {# polubień}})" @@ -10407,16 +9823,8 @@ msgstr "Nie subskrybujesz już listy" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Niepożądane treści o charakterze seksualnym" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Prześlij plik tekstowy do:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Prześlij z aparatu" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Prześlij z plików" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Prześlij z biblioteki" @@ -10492,7 +9900,7 @@ msgstr "Przesyłanie zdjęć..." msgid "Uploading link thumbnail..." msgstr "Przesyłanie miniatury..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Przesyłanie wideo..." @@ -10746,7 +10154,7 @@ msgstr "Wideo nie zostało odnalezione." msgid "Video settings" msgstr "Ustawienia wideo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Wideo zostało przesłane" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Wyświetl zdjęcie profilowe {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Więcej informacji można znaleźć na blogu" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Wyświetl dziennik systemowy" +msgstr "Wyświetl dziennik systemowy<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Wyświetl szczegóły" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Wyświetl profil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Wyświetl zdjęcie profilowe" @@ -10888,15 +10291,10 @@ msgstr "Wyświetl wyciszone konta" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Wyświetla całe zdjęcie" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Przepraszamy, ale nie udało nam się wczytać tej listy. Jeśli problem msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Przepraszamy, ale w tej chwili nie mogliśmy wczytać wyciszonych przez ciebie słów. Spróbuj ponownie." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Przepraszamy, ale twoje wyszukiwanie się nie powiodło. Spróbuj ponownie za kilka minut." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Dlaczego ta osoba powinna zostać sprawdzona?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/pt-BR/messages.po b/src/locale/locales/pt-BR/messages.po index 0d4a6ad6f..b0b0828fe 100644 --- a/src/locale/locales/pt-BR/messages.po +++ b/src/locale/locales/pt-BR/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {seguindo} other {seguindo}}" +msgstr "{0, plural, one {seguindo} other {seguindo}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {curtida} other {curtidas}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {postagem} other {postagens}}" +msgstr "{0, plural, one {postagem} other {postagens}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citação} other {citações}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repostagem} other {repostagens}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citação} other {citações}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repostagem} other {repostagens}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {salvo} other {salvos}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# mais}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Conta)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} às {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Entre<1> ou <2>crie uma conta<3> <4>para procurar notícias, esportes, política e tudo o mais que acontece no Bluesky." @@ -587,11 +567,7 @@ msgstr "Sobre" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamento abusivo ou discriminatório" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Acessibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Acessibilidade" +msgstr "Acessibilidade<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta" +msgstr "Conta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Conta bloqueada" @@ -669,26 +634,18 @@ msgstr "Conta silenciada pela lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opções da conta" +msgstr "Opções da conta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Conta removida do acesso rápido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Conta desbloqueada" @@ -778,7 +735,7 @@ msgstr "Adicionar outra conta" msgid "Add another post" msgstr "Adicionar outra postagem" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Adicionar outra postagem ao tópico" @@ -889,20 +846,12 @@ msgstr "Adulto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo adulto" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Conteúdo adulto" @@ -921,11 +870,7 @@ msgstr "Rótulos de conteúdo adulto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo de abuso sexual adulto" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Uma ilustração mostrando que o Bluesky seleciona verificadores confiáveis e estes, por sua vez, verificam contas de usuário individuais." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Outro problema" @@ -1171,19 +1112,11 @@ msgstr "e" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "" -======= -msgstr "Abuso sexual de animais" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" -msgstr "Bem-estar animal" ->>>>>>> upstream/main +msgstr "Bem-estar animal>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Anúncio" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunciando verificação no Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamento Anti-social" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Anunciando verificação no Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "A senha do app deve conter no mínimo 4 caracteres" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Senhas de aplicativo" +msgstr "Senhas de aplicativo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Senhas de Aplicativo" @@ -1307,19 +1225,12 @@ msgstr "Recorrer da suspensão" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Recorrer desta decisão" +msgstr "Recorrer desta decisão<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aparência" @@ -1331,23 +1242,14 @@ msgstr "Utilizar feeds recomendados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplicar Pull Request" +msgstr "Aplicar Pull Request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arquivado desde {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arquivado desde {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Postagem arquivada" @@ -1416,18 +1318,11 @@ msgstr "Atribuir tópico ao algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "No mínimo 8 caracteres" +msgstr "No mínimo 8 caracteres<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponível" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponível" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,11 +1360,7 @@ msgstr "Voltar às Conversas" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" -======= -msgstr "Atividades banidas ou violações de segurança" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" @@ -1525,9 +1411,8 @@ msgstr "Comece o processo de verificação de idade preenchendo os campos abaixo #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversário" +msgstr "Aniversário<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1535,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquear conta" @@ -1575,15 +1446,8 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e excluir" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloquear e/ou excluir esta conversa" +msgstr "Bloquear e excluir<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Lista de bloqueio" @@ -1603,18 +1467,14 @@ msgstr "Bloquear usuário" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear usuário" +msgstr "Bloquear usuário<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloqueado" @@ -1646,40 +1506,18 @@ msgstr "Os bloqueios são públicos. Contas bloqueadas não podem te responder, #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Bloquear não impede que rótulos sejam colocados em sua conta, mas impedirá que esta conta responda aos seus tópicos e interaja com você." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "O Bluesky não pode confirmar que a data mostrada é legítima." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Bloquear não impede que rótulos sejam colocados em sua conta, mas impedirá que esta conta responda aos seus tópicos e interaja com você.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "O Bluesky não pode confirmar que a data mostrada é legítima." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "O Bluesky é uma rede aberta onde você pode escolher seu fornecedor de hospedagem. Se você é um desenvolvedor, você pode hospedar seu próprio servidor." @@ -1731,15 +1569,9 @@ msgstr "Livros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Violação das regras do site" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Navegue por mais contas na página Explorar" @@ -1850,19 +1682,13 @@ msgstr "Câmera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1890,17 +1716,11 @@ msgstr "Cancelar reativação e desconectar" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar pesquisa" +msgstr "Cancelar pesquisa<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Não é possível interagir com um usuário bloqueado" @@ -1951,11 +1771,7 @@ msgstr "Janela de troca de senha" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Alterar categoria de relatório" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2017,11 +1833,7 @@ msgid "Chat requests" msgstr "Pedidos de conversa" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2058,11 +1870,7 @@ msgstr "Confira sua caixa de entrada por um e-mail com um código de confirmaç #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" -======= -msgstr "Segurança infantil" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" @@ -2188,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2270,7 +2070,7 @@ msgstr "Fechar janela de boas-vindas" msgid "Closes password update alert" msgstr "Fecha o alerta de mudança de senha" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Fecha a janela de nova postagem e descarta o rascunho" @@ -2342,7 +2142,7 @@ msgstr "Escreva postagens de até {0, plural, other {# caracteres}}" msgid "Compose reply" msgstr "Escrever resposta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Comprimindo vídeo..." @@ -2464,11 +2264,7 @@ msgstr "Conteúdo indisponível" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo promovendo ou representando auto-mutilação" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2576,17 +2372,11 @@ msgstr "Copiar DID do autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código" +msgstr "Copiar código<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar DID" @@ -2748,7 +2538,7 @@ msgstr "Criar conta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Criar uma conta" @@ -2809,35 +2599,16 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opções de personalização" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalize quem pode interagir com esta postagem." +msgstr "Opções de personalização<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personaliza a sua experiência do Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" -msgstr "" - -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Desafios ou atividades perigosas" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Substâncias perigosas ou abuso de drogas" @@ -2846,7 +2617,6 @@ msgstr "Substâncias perigosas ou abuso de drogas" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Escuro" @@ -2883,17 +2653,13 @@ msgstr "Painel de depuração" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Padrão" @@ -2902,17 +2668,10 @@ msgid "Default icons" msgstr "Ícones padrão" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3075,20 +2834,26 @@ msgstr "Desativar 2FA por e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desativar feedback tátil" +msgstr "Desativar feedback tátil<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3102,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3172,7 +2926,7 @@ msgstr "Descobrir novos feeds" msgid "Dismiss" msgstr "Dispensar" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Dispensar erro" @@ -3260,11 +3014,8 @@ msgstr "Não se preocupe! Todas as mensagens e configurações existentes estão #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3312,9 +3063,8 @@ msgstr "Baixar o Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Baixar arquivo CAR" +msgstr "Baixar arquivo CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3333,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3381,10 +3129,6 @@ msgstr "ex.: Meus perfis favoritos." msgid "e.g. Users that repeatedly reply with ads." msgstr "ex.: Perfis que são irritantes." -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 -msgid "Eating disorders" -msgstr "Transtornos alimentares" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" msgstr "" @@ -3404,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar foto de perfil" @@ -3679,7 +3423,7 @@ msgstr "Entra em tela cheia" msgid "Entertainment" msgstr "Entretenimento" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Erro" @@ -3700,11 +3444,11 @@ msgstr "Mensagem de erro" msgid "Error occurred while saving file" msgstr "Não foi possível salvar o arquivo" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Não foi possível processar o captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Erro: {error}" @@ -3726,19 +3470,8 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Demais itens" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menções ou respostas excessivas" +msgstr "Demais itens<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensagens excessivas ou indesejadas" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluir usuário que você segue" @@ -3862,11 +3595,7 @@ msgstr "Preferências de Mídia Externa" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo extremista" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4070,23 +3799,13 @@ msgstr "Não foi possível verificar o nome de usuário. Por favor tente novamen #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Conta falsa ou bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Informações falsas sobre eleições" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feed" @@ -4227,26 +3946,8 @@ msgstr "Finalizar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Atividades físicas" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Preto Sólido" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Azul Sólido" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Branco Sólido" +msgstr "Atividades físicas<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexível" @@ -4257,16 +3958,7 @@ msgstr "Flexível" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seguir" @@ -4309,16 +4001,8 @@ msgstr "Seguir todas as contas" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seguir de volta" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seguir de volta" @@ -4358,13 +4042,9 @@ msgstr "Seguidores que você conhece" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Seguindo" @@ -4372,16 +4052,11 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo" +msgstr "Seguindo<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Seguindo {0}" @@ -4468,15 +4143,8 @@ msgstr "Esqueceu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libere o seu feed" +msgstr "Libere o seu feed<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Frequentemente Posta Conteúdo Indesejado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De" @@ -4577,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dê uma cara nova pro seu perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violações flagrantes da lei ou dos termos de serviço" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorificação da violência" ->>>>>>> upstream/main +msgstr "Dê uma cara nova pro seu perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4698,11 +4356,7 @@ msgstr "Conteúdo Gráfico" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo violento gráfico" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4741,24 +4395,8 @@ msgstr "Feedback tátil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Assédio, intolerância ou \"trollagem\"" -======= -msgstr "Assédio ou ódio" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Atividades nocivas ou de alto risco" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Prejudicar ou colocar menores em perigo" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4777,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Discurso de ódio" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4790,15 +4424,10 @@ msgstr "Tem um código? <0>Clique aqui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Precisa de ajuda?" +msgstr "Precisa de ajuda?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4857,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar opções de personalização" +msgstr "Ocultar opções de personalização<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ocultar postagem para mim" @@ -4993,11 +4613,7 @@ msgstr "Como devemos abrir este link?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tráfico humano" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5061,17 +4677,9 @@ msgstr "Se você for um desenvolvedor, você pode hospedar seu próprio servidor #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Se você estiver tentando alterar seu nome de usuário ou e-mail, faça isso antes de desativar." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal e Urgente" +msgstr "Se você estiver tentando alterar seu nome de usuário ou e-mail, faça isso antes de desativar.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imagem" @@ -5091,29 +4699,15 @@ msgstr "Imagem salva" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Imagens não podem ser salvas a menos que seja concedida permissão para acessar sua galeria de fotos." +msgstr "Imagens não podem ser salvas a menos que seja concedida permissão para acessar sua galeria de fotos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Falsificação de identidade ou alegações falsas sobre identidade ou filiação" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Falsificação de identidade, desinformação ou alegações falsas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5141,15 +4735,8 @@ msgstr "No app, No dispositivo, Todos" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "No app, No dispositivo, Pessoas que você segue" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mensagens inapropriadas ou links explícitos" +msgstr "No app, No dispositivo, Pessoas que você segue<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5177,21 +4764,13 @@ msgstr "Insira a senha para excluir a conta" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Insira o código que você recebeu por e-mail" +msgstr "Insira o código que você recebeu por e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interação limitada" @@ -5265,7 +4844,7 @@ msgstr "No momento apenas <0>{0} está aqui! Adicione mais pessoas ao seu p msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "É só você por enquanto! Adicione mais pessoas ao seu pacote inicial pesquisando acima." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID da requisição: {0}" @@ -5308,17 +4887,13 @@ msgstr "Rotulado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Rotulado pelo autor." +msgstr "Rotulado pelo autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Rótulos" @@ -5383,17 +4958,9 @@ msgstr "Saiba Mais" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Saiba mais sobre a verificação de idade" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Saiba mais sobre o Bluesky" +msgstr "Saiba mais sobre a verificação de idade<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Saiba mais sobre a auto-hospedagem do seu Servidor de Dados Pessoais." @@ -5428,15 +4995,10 @@ msgstr "Saiba mais sobre o que é público no Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Saiba mais nas suas <0>configurações da conta." +msgstr "Saiba mais nas suas <0>configurações da conta.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Saiba mais." @@ -5500,11 +5062,7 @@ msgid "Like" msgstr "Curtir" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Curtidas ({0, plural, one {# curtida} other {# curtidas}})" @@ -5567,13 +5125,9 @@ msgstr "Curtidas das suas repostagens" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificações de curtidas das suas repostagens" +msgstr "Notificações de curtidas das suas repostagens<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Curtidas nesta postagem" @@ -5877,49 +5431,24 @@ msgstr "Opções de mensagem" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensagens" +msgstr "Mensagens<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Meia-noite" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Assédio ou bullying de menores" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notificações diversas" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Conta Enganosa" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Postagem Enganosa" -======= -msgstr "Enganoso" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -5979,15 +5508,10 @@ msgstr "Ferramentas de moderação" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "O moderador escolheu aplicar um aviso geral neste conteúdo." +msgstr "O moderador escolheu aplicar um aviso geral neste conteúdo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mais feeds" @@ -6128,18 +5652,8 @@ msgstr "Meus Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nome ou Descrição Viola os Padrões da Comunidade" - -======= ->>>>>>> upstream/main +msgstr "Nome<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6343,16 +5857,11 @@ msgstr "Sem imagem" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Sem curtidas ainda" +msgstr "Sem curtidas ainda<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Você não está mais seguindo {0}" @@ -6364,7 +5873,7 @@ msgstr "Nenhuma mensagem ainda" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Chega de algoritmos de rolagem eterna cheios de lixo. Encontre feeds que trabalham para você, não contra você." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Nenhuma notificação!" @@ -6418,9 +5927,9 @@ msgstr "Nenhum resultado encontrado" msgid "No results found for \"{query}\"" msgstr "Nenhum resultado encontrado para \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Nenhum resultado encontrado para {query}" @@ -6460,11 +5969,7 @@ msgstr "Ninguém foi encontrado. Tente procurar por outra pessoa." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Imagens íntimas não consensuais" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6559,15 +6064,8 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudez ou conteúdo adulto sem rótulo aplicado" +msgstr "Nudez<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6588,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Ok" @@ -6693,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Abrir menu" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Abrir seletor de emoji" @@ -6793,7 +6287,7 @@ msgstr "Abre o editor de postagem" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Abre a galeria do dispositivo para selecionar até {MAX_IMAGES, plural, other {# imagens}} ou um único vídeo ou GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Abre o seletor de emoji" @@ -6833,15 +6327,10 @@ msgstr "Abre o formulário de redefinição de senha" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Abre configurações de idioma da postagem" +msgstr "Abre configurações de idioma da postagem<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Abre este perfil" @@ -6875,12 +6364,7 @@ msgstr "Estado OTA: Nenhum disponível" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Outro" @@ -6890,23 +6374,8 @@ msgstr "Outra conta" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" -======= -msgstr "Outros problemas de segurança infantil" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Outros conteúdos perigosos" @@ -6917,8 +6386,7 @@ msgstr "Outros conteúdos de assédio ou ódio" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 msgid "Other misleading content" -msgstr "Outros conteúdos enganosos" ->>>>>>> upstream/main +msgstr "Outros conteúdos enganosos>>>>>>> upstream/main" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 msgid "Other network rule-breaking" @@ -7006,23 +6474,16 @@ msgstr "Pessoas seguindo @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Pessoas que eu sigo" +msgstr "Pessoas que eu sigo<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "A permissão para acessar sua galeria de fotos foi negada. Por favor, habilite-a nas configurações do dispositivo." @@ -7279,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postagem" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Postar" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Postar Tudo" @@ -7307,19 +6768,12 @@ msgstr "Postagem excluída" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Falha ao enviar a postagem. Por favor verifique sua conexão de internet e tente novamente." +msgstr "Falha ao enviar a postagem. Por favor verifique sua conexão de internet e tente novamente.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Postagem excluída" @@ -7453,13 +6907,9 @@ msgstr "Política de Privacidade" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Violação da privacidade de um menor" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Processando vídeo..." @@ -7487,19 +6937,12 @@ msgstr "Perfil atualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Público" @@ -7513,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listas públicas e compartilháveis que podem ser usadas para gerar feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicar postagem" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicar postagens" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicar respostas" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicar resposta" @@ -7591,13 +7034,9 @@ msgstr "Citações desabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citações" +msgstr "Citações<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citações desta postagem" @@ -7658,12 +7097,12 @@ msgstr "Leia os Termos de Serviço do Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7754,8 +7193,8 @@ msgstr "Remover anexo" msgid "Remove Avatar" msgstr "Remover avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Remover banner" @@ -7929,17 +7368,13 @@ msgstr "Respostas desabilitadas" msgid "Replies to this post are disabled." msgstr "Respostas para esta postagem estão desativadas." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Responder ({0, plural, one {# resposta} other {# respostas}})" @@ -8029,11 +7464,7 @@ msgstr "Denúncia enviada" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Denunciar conversa" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8104,13 +7535,9 @@ msgstr "Repostado por você" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repostagens" +msgstr "Repostagens<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Repostagens" @@ -8183,17 +7610,13 @@ msgstr "Redefinir tutoriais" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Redefinir senha" +msgstr "Redefinir senha<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Tentar entrar novamente" @@ -8351,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciência" +msgstr "Ciência<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Rolar à esquerda" @@ -8408,11 +7828,11 @@ msgstr "Pesquisar por \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Pesquisar por \"{interestsDisplayName}\" (ativo)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Pesquisar por \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Pesquisar por \"{searchText}\"" @@ -8437,7 +7857,7 @@ msgid "Search GIFs" msgstr "Pesquisar por GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "A pesquisa está indisponível quando desconectado" @@ -8530,11 +7950,7 @@ msgstr "Selecione uma cor" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Selecione um motivo" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8671,11 +8087,7 @@ msgstr "Não é possível selecionar múltiplos tipos de mídia." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Auto-mutilação ou comportamentos perigosos" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8745,19 +8157,12 @@ msgstr "Definir data de nascimento" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir uma nova senha" +msgstr "Definir uma nova senha<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configure sua conta" @@ -8909,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8999,15 +8400,10 @@ msgstr "Mostrar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar respostas como" +msgstr "Mostrar respostas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostrar resposta para todos" @@ -9027,13 +8423,9 @@ msgstr "Mostrar aviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar aviso e filtrar dos feeds" +msgstr "Mostrar aviso e filtrar dos feeds<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Mostra informações sobre quando esta postagem foi criada" @@ -9054,7 +8446,7 @@ msgstr "Exibe o conteúdo" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9261,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Fonte: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; menções ou respostas excessivas" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9433,23 +8813,9 @@ msgstr "Sugeridos para você" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo" +msgstr "Sugestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Alvorada" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Entardecer" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9521,11 +8887,7 @@ msgstr "Toque para dispensar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Assédio direcionado" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9571,18 +8933,8 @@ msgstr "Termos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termos de Serviço" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Termos utilizados violam as diretrizes da comunidade" - -======= ->>>>>>> upstream/main +msgstr "Termos de Serviço<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto e tags" @@ -9631,11 +8983,7 @@ msgid "That's everything!" msgstr "Isso é tudo!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "A conta poderá interagir com você após o desbloqueio." @@ -9767,17 +9115,12 @@ msgstr "Tivemos um problema ao contatar o servidor deste feed" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Houve um problema ao comunicar com o servidor, por favor verifique sua conexão de internet e tente novamente." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Tivemos um problema ao carregar notificações. Toque aqui para tentar de novo." +msgstr "Tivemos um problema ao carregar notificações. Toque aqui para tentar de novo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Tivemos um problema ao carregar as postagens. Toque aqui para tentar de novo." @@ -9816,16 +9159,9 @@ msgstr "Houve um problema ao atualizar seus feeds, por favor verifique sua conex #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9853,19 +9189,14 @@ msgstr "Houve um problema inesperado no aplicativo. Por favor, deixe-nos saber s #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Muitos usuários estão tentando acessar o Bluesky! Ativaremos sua conta assim que possível." +msgstr "Muitos usuários estão tentando acessar o Bluesky! Ativaremos sua conta assim que possível.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10018,13 +9349,9 @@ msgstr "Esta lista está vazia." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Este serviço de moderação está indisponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contato." +msgstr "Este serviço de moderação está indisponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contato.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Esta postagem alega ter sido criada em <0>{0}, mas ela apareceu no Bluesky em <1>{1}." @@ -10142,11 +9469,7 @@ msgstr "Preferências dos Tópicos" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ameaças ou incitação" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10196,17 +9519,10 @@ msgstr "Assunto" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traduzir" @@ -10328,22 +9644,13 @@ msgstr "Desbloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloquear Conta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Desbloquear Conta?" @@ -10365,16 +9672,8 @@ msgstr "Desfazer repostagem" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Desfazer repostagem ({0, plural, one {# repostagem} other {# repostagens}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Deixar de seguir" +msgstr "Desfazer repostagem ({0, plural, one {# repostagem} other {# repostagens}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Deixar de seguir {0}" @@ -10402,32 +9701,18 @@ msgstr "Verificador desconhecido" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Conteúdo adulto não sinalizado" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Conteúdo adulto não sinalizado, abusivo ou não consensual" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Descurtir" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Descurtir ({0, plural, one {# curtida} other {# curtidas}})" @@ -10538,16 +9823,8 @@ msgstr "Cancelada inscrição na lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Formato de vídeo não suportado: {mimeType}" +msgstr "Formato de vídeo não suportado: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Conteúdo Sexual Indesejado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10597,20 +9874,20 @@ msgstr "Carregar um arquivo de texto para:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Tirar uma foto" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Carregar um arquivo" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Carregar da galeria" @@ -10623,7 +9900,7 @@ msgstr "Enviando imagens..." msgid "Uploading link thumbnail..." msgstr "Enviando prévia de link..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Enviando vídeo..." @@ -10877,7 +10154,7 @@ msgstr "Vídeo não encontrado." msgid "Video settings" msgstr "Configurações de vídeo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Vídeo enviado" @@ -10902,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Visualizar" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ver o avatar de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10928,15 +10209,10 @@ msgstr "Veja a postagem no blog para mais detalhes" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver depuração" +msgstr "Ver depuração<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ver detalhes" @@ -10972,10 +10248,6 @@ msgstr "Visualizar postagem" msgid "View profile" msgstr "Ver perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Ver o avatar" @@ -11019,15 +10291,10 @@ msgstr "Veja suas contas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver suas verificações" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Ver suas verificações<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Ver imagem completa" @@ -11037,24 +10304,16 @@ msgstr "Abre o vídeo no modo paisagem" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Conteúdo violento ou ameaçador>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violência" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Conteúdo violento ou ameaçador" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11204,7 +10463,7 @@ msgstr "Tivemos um problema ao exibir esta lista. Se continuar acontecendo, cont msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Não foi possível carregar sua lista de palavras silenciadas. Por favor, tente novamente." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Lamentamos, mas sua pesquisa não pôde ser concluída. Por favor, tente novamente em alguns minutos." @@ -11305,11 +10564,7 @@ msgstr "Por que está recorrendo?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Por que essa conversa deve ser revisada?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11336,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Por que este usuário deve ser analisado?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 @@ -11775,11 +11026,7 @@ msgstr "Você está conectado com uma Senha de app. Entre usando a sua senha pad #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Você já enviou um recurso para este rótulo. Ele está sendo revisado pela equipe de moderação." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/pt-PT/messages.po b/src/locale/locales/pt-PT/messages.po index ff41caea0..d59581ff3 100644 --- a/src/locale/locales/pt-PT/messages.po +++ b/src/locale/locales/pt-PT/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {seguidor} other {seguidores}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {a seguir} other {a seguir}}" +msgstr "{0, plural, one {a seguir} other {a seguir}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {gosto} other {gostos}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {publicação} other {publicações}}" +msgstr "{0, plural, one {publicação} other {publicações}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citação} other {citações}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {republicação} other {republicações}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citação} other {citações}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {republicação} other {republicações}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {guardado} other {guardados}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, one {+# outro}other {+# outros}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Conta)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} às {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Inicie sessão<1> ou <2>crie uma conta<3> <4>para procurar por notícias, desporto, política e tudo resto que acontece no Bluesky." @@ -587,11 +567,7 @@ msgstr "Sobre" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamento abusivo ou discriminatório" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Acessibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Definições de acessibilidade" +msgstr "Definições de acessibilidade<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta" +msgstr "Conta<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Conta bloqueada" @@ -669,26 +634,18 @@ msgstr "Conta silenciada pela Lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Definições da conta" +msgstr "Definições da conta<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Fornecedor de conta" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Conta removida do acesso rápido" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Conta desbloqueada" @@ -778,7 +735,7 @@ msgstr "Adicionar outra conta" msgid "Add another post" msgstr "Adicionar outra publicação" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Adicionar outra publicação ao fio" @@ -889,20 +846,12 @@ msgstr "Adulto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo adulto" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Conteúdo adulto" @@ -921,11 +870,7 @@ msgstr "Rótulos de Conteúdo Adulto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo de abuso sexual adulto" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Uma imagem a mostrar que o Bluesky seleciona verificadores confiáveis e, por sua vez, verificadores confiáveis verificam contas de utilizadores individuais." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Um problema não incluído nestas opções" @@ -1171,19 +1112,11 @@ msgstr "e" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Abuso sexual de animais" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bem-estar animal" ->>>>>>> upstream/main +msgstr "Bem-estar animal>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Comunicado" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunciando verificação no Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportamento antissocial" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Anunciando verificação no Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Todos" ->>>>>>> upstream/main +msgstr "Todos>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "A palavra-passe da aplicação deve conter pelo menos 4 caracteres" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Palavras-passe da Aplicação" +msgstr "Palavras-passe da Aplicação<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Palavras-passe da Aplicação" @@ -1307,19 +1225,12 @@ msgstr "Recorrer da Suspensão" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Recorrer desta decisão" +msgstr "Recorrer desta decisão<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aparência" @@ -1331,23 +1242,14 @@ msgstr "Utilizar feeds recomendados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplicar Pull Request" +msgstr "Aplicar Pull Request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arquivado desde {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arquivado desde {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Publicação arquivada" @@ -1416,18 +1318,11 @@ msgstr "Atribuir tópico para o algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "No mínimo 8 caracteres" +msgstr "No mínimo 8 caracteres<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponível" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponível" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Voltar às Conversas" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" msgstr "" -======= -msgstr "Atividades banidas ou violações de segurança" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Regresso de um utilizador banido" ->>>>>>> upstream/main +msgstr "Regresso de um utilizador banido>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Comece o processo de verificação de idade, preenchendo os campos abaix #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversário" +msgstr "Aniversário<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Bloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Bloquear conta" @@ -1579,15 +1446,8 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e eliminar" +msgstr "Bloquear e eliminar<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Bloquear e/ou eliminar esta conversa" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Bloquear lista" @@ -1607,18 +1467,14 @@ msgstr "Bloquear utilizador" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear Utilizador" +msgstr "Bloquear Utilizador<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Bloquear utilizador e/ou eliminar esta conversa" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Bloqueado" @@ -1650,40 +1506,18 @@ msgstr "A lista de contas que bloqueou é pública. Contas bloqueadas não podem #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Bloquear não impedirá a aplicação de rótulos na sua conta, mas impedirá esta conta de responder aos seus fios ou de interagir consigo." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "O Bluesky não pode confirmar a veracidade da data aplicada." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Bloquear não impedirá a aplicação de rótulos na sua conta, mas impedirá esta conta de responder aos seus fios ou de interagir consigo.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "O Bluesky não pode confirmar a veracidade da data aplicada." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "O Bluesky é uma rede aberta em que pode escolher o seu fornecedor de hospedagem. Se for um programador, pode hospedar o seu próprio servidor." @@ -1735,15 +1569,9 @@ msgstr "Livros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Violação das regras do site" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Procure mais contas na página Explorar" @@ -1854,19 +1682,13 @@ msgstr "Câmara" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Cancelar reativação e terminar sessão" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar pesquisa" +msgstr "Cancelar pesquisa<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Não pode interagir com um utilizador bloqueado" @@ -1955,11 +1771,7 @@ msgstr "Janela de diálogo de alteração da palavra-passe" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Alterar categoria da denúncia" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Pedidos de conversa" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Procure na sua caixa de entrada por um e-mail com o código de confirma #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Segurança infantil" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Pornografia infantil (CSAM)" ->>>>>>> upstream/main +msgstr "Pornografia infantil (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Fechar modal de boas-vindas" msgid "Closes password update alert" msgstr "Fecha o aviso de atualização de palavra-passe" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Fechar compositor de publicação e descartar rascunho de publicação" @@ -2350,7 +2142,7 @@ msgstr "Compor publicações com até {0, plural, other {# caracteres}} de compr msgid "Compose reply" msgstr "Escrever resposta" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "A comprimir vídeo..." @@ -2472,11 +2264,7 @@ msgstr "Conteúdo Indisponível" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo promovendo ou representando automutilação" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copiar DID do autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código" +msgstr "Copiar código<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiar DID" @@ -2756,7 +2538,7 @@ msgstr "Criar Conta" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Criar uma conta" @@ -2817,35 +2599,16 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Definições de personalização" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalize quem pode interagir com esta publicação." +msgstr "Definições de personalização<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personaliza a sua experiência Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Desafios ou atividades perigosas" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Substâncias perigosas ou abuso de drogas" @@ -2854,7 +2617,6 @@ msgstr "Substâncias perigosas ou abuso de drogas" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Escuro" @@ -2891,19 +2653,13 @@ msgstr "Painel de debug" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Conteúdo adulto Deepfake" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Padrão" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Ícones padrões" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Desativar 2FA por e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desativar feedback tátil" +msgstr "Desativar feedback tátil<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Desativar respostas completamente>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Desativar respostas completamente" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Descobrir Feeds Novos" msgid "Dismiss" msgstr "Ignorar" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Ignorar falha" @@ -3271,11 +3014,8 @@ msgstr "Não se preocupe! Todas as mensagens e configurações existentes serão #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Transferir Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Transferir ficheiro CAR" +msgstr "Transferir ficheiro CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Doxxing" ->>>>>>> upstream/main +msgstr "Doxxing>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "p. ex. Utilizadores que repetidamente respondem com anúncios." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Desordens alimentares" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Editar" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editar foto de perfil" @@ -3693,7 +3423,7 @@ msgstr "Entra em ecrã cheio" msgid "Entertainment" msgstr "Entretenimento" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Erro" @@ -3714,11 +3444,11 @@ msgstr "Mensagem de erro" msgid "Error occurred while saving file" msgstr "Ocorreu um erro ao guardar o ficheiro" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Ocorreu um erro ao obter a resposta do captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Erro: {error}" @@ -3740,19 +3470,8 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tudo o resto" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Menções ou respostas excessivas" +msgstr "Tudo o resto<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mensagens excessivas ou indesejadas" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excluir utilizadores que eu sigo" @@ -3876,11 +3595,7 @@ msgstr "Preferências de Conteúdo Multimédia Externo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conteúdo extremista" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Falha ao tentar alterar o nome de utilizador. Por favor, tente novamente #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Conta falsa ou bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Informação falsa sobre eleições" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Feed" @@ -4241,26 +3946,8 @@ msgstr "Terminar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Preto sólido" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Azul sólido" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Branco sólido" +msgstr "Fitness<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexível" @@ -4271,16 +3958,7 @@ msgstr "Flexível" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Seguir" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Seguir" @@ -4323,16 +4001,8 @@ msgstr "Seguir todas as contas" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Seguir de volta" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Seguir de volta" @@ -4372,13 +4042,9 @@ msgstr "Seguidores que conhece" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "A seguir" @@ -4386,16 +4052,11 @@ msgstr "A seguir" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "A seguir" +msgstr "A seguir<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "A seguir {0}" @@ -4482,15 +4143,8 @@ msgstr "Esqueceu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Liberte o seu feed" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publica frequentemente conteúdo indesejado" +msgstr "Liberte o seu feed<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dê um rosto ao seu perfil" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Violações flagrantes das leis ou termos de serviço" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorificação de violência" ->>>>>>> upstream/main +msgstr "Dê um rosto ao seu perfil<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Conteúdo Multimédia Gráfico" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Conteúdo violento gráfico" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Grooming ou comportamento predatório" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking ou ataques de sistema" ->>>>>>> upstream/main +msgstr "Hacking ou ataques de sistema>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Vibração" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Assédio, \"trolling\" ou intolerância" -======= -msgstr "Assédio ou ódio" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Atividades perigosas ou de alto risco" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Prejudicar ou colocar menores em perigo" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Discurso de ódio" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Tem um código? <0>Clique aqui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Está com problemas?" +msgstr "Está com problemas?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar definições de personalização" +msgstr "Ocultar definições de personalização<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Esconder listas" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ocultar publicação para mim" @@ -5015,11 +4613,7 @@ msgstr "Como devemos abrir este link?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tráfico humano" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Se é programador, pode hospedar o seu próprio servidor." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Se está a tentar alterar o seu nome de utilizador ou e-mail, faça-o antes de desativar." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal e Urgente" +msgstr "Se está a tentar alterar o seu nome de utilizador ou e-mail, faça-o antes de desativar.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imagem" @@ -5113,29 +4699,15 @@ msgstr "Imagem guardada" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Imagens não podem ser guardadas se não tiver sido concedida permissão para aceder à sua galeria de fotos." +msgstr "Imagens não podem ser guardadas se não tiver sido concedida permissão para aceder à sua galeria de fotos.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Identidade falsa ou falsas afirmações sobre identidade ou afiliação" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Identidade falsa, desinformação ou afirmações falsas" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Impersonação" ->>>>>>> upstream/main +msgstr "Impersonação>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Na aplicação, Push, Todos" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Na aplicação, Push, Pessoas que segue" +msgstr "Na aplicação, Push, Pessoas que segue<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mensagens inapropriadas ou links explícitos" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Introduza a palavra-passe para eliminar a conta" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Introduza o código que lhe foi enviado por e-mail" +msgstr "Introduza o código que lhe foi enviado por e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interação limitada" @@ -5287,7 +4844,7 @@ msgstr "De momento é só <0>{0} ! Adicione mais pessoas ao seu pacote de in msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "De momento é só você! Adicione mais pessoas ao seu pacote de iniciante pesquisando acima." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID do trabalho: {0}" @@ -5330,17 +4887,13 @@ msgstr "Rotulado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Rotulado pelo autor." +msgstr "Rotulado pelo autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Rótulos" @@ -5405,17 +4958,9 @@ msgstr "Saber mais" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Saiba mais sobre a verificação de idade" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Saiba mais sobre o Bluesky" +msgstr "Saiba mais sobre a verificação de idade<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Saiba mais sobre como hospedar o seu PDS." @@ -5450,15 +4995,10 @@ msgstr "Saiba mais sobre o que é público no Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Saiba mais nas suas <0>definições de conta." +msgstr "Saiba mais nas suas <0>definições de conta.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Saber mais." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Gostar" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Gosto ({0, plural, one {# gosto} other {# gostos}})" @@ -5589,13 +5125,9 @@ msgstr "Gostos das suas republicações" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificações de gostos nas suas republicações" +msgstr "Notificações de gostos nas suas republicações<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Gostos nesta publicação" @@ -5899,49 +5431,24 @@ msgstr "Opções de mensagem" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensagens" +msgstr "Mensagens<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Meia-noite" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Assédio ou bullying de menores" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notificações diversas" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Conta enganadora" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Publicação enganadora" -======= -msgstr "Enganador" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Ferramentas de moderação" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "O moderador optou por definir um aviso geral sobre o conteúdo." +msgstr "O moderador optou por definir um aviso geral sobre o conteúdo.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mais feeds" @@ -6150,18 +5652,8 @@ msgstr "Os Meus Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Nome ou Descrição Viola os Padrões da Comunidade" - -======= ->>>>>>> upstream/main +msgstr "Nome<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Sem imagem" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Sem gostos ainda" +msgstr "Sem gostos ainda<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Já não segue {0}" @@ -6386,7 +5873,7 @@ msgstr "Sem mensagens ainda" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Chega de \"doomscrolling\" em algoritmos cheios de lixo. Encontre feeds que funcionam para si, não contra si." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Sem notificações ainda!" @@ -6440,9 +5927,9 @@ msgstr "Nenhum resultado encontrado" msgid "No results found for \"{query}\"" msgstr "Não foram encontrados resultados para \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Não foram encontrados resultados para {query}" @@ -6482,11 +5969,7 @@ msgstr "Ninguém foi encontrado. Tente pesquisar por outra pessoa." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Imagens íntimas não consensuais" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nudez ou conteúdo adulto não rotulado como tal" +msgstr "Nudez<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "OK" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Abrir menu lateral" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Abrir selecionador de emojis" @@ -6815,7 +6287,7 @@ msgstr "Abre o compositor" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Abre a galeria do dispositivo para selecionar até {MAX_IMAGES, plural, one{# imagem}other {# imagens}} ou um único vídeo ou GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Abre selecionador de emojis" @@ -6855,15 +6327,10 @@ msgstr "Abre formulário de redefinição de palavra-passe" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Abre as definições de idioma da publicação" +msgstr "Abre as definições de idioma da publicação<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Abre este perfil" @@ -6897,12 +6364,7 @@ msgstr "Estado OTA: Nenhuma disponível" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Outro" @@ -6912,35 +6374,8 @@ msgstr "Outra conta" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Outra questão de segurança infantil" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Outro conteúdo perigoso" @@ -6963,8 +6398,7 @@ msgstr "Outro conteúdo de violência sexual" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Outro conteúdo violento" ->>>>>>> upstream/main +msgstr "Outro conteúdo violento>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Pessoas a seguir @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Pessoas que eu sigo" +msgstr "Pessoas que eu sigo<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Pessoas que segue" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Pessoas que menciona" +msgstr "Pessoas que menciona>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "A permissão para aceder à sua galeria de fotos foi negada. Por favor, ative-a nas suas definições de sistema." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Publicação" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicação" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicar tudo" @@ -7341,19 +6768,12 @@ msgstr "Publicação eliminada" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Falha no carregamento da publicação. Por favor, verifique a sua conexão à internet e tente novamente." +msgstr "Falha no carregamento da publicação. Por favor, verifique a sua conexão à internet e tente novamente.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "A publicação foi eliminada" @@ -7487,13 +6907,9 @@ msgstr "Política de Privacidade" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Violação da privacidade de um menor" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "A processar o vídeo..." @@ -7521,15 +6937,11 @@ msgstr "Perfil atualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promoção ou venda de items ou artigos proibidos" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! Pode editar quem pode interagir com esta publicação." ->>>>>>> upstream/main +msgstr "Psst! Pode editar quem pode interagir com esta publicação.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Listas públicas e partilháveis de utilizadores que podem ser usadas para gerar feeds." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicar publicação" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicar publicações" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicar respostas" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicar resposta" @@ -7622,13 +7034,9 @@ msgstr "Citações desativadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citações" +msgstr "Citações<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citações desta publicação" @@ -7689,12 +7097,12 @@ msgstr "Leia os Termos de Serviço do Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Remover anexo" msgid "Remove Avatar" msgstr "Remover foto de perfil" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Remover Banner" @@ -7960,17 +7368,13 @@ msgstr "Respostas desativadas" msgid "Replies to this post are disabled." msgstr "As respostas a esta publicação estão desativadas." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Responder" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Responder ({0, plural, one {# resposta} other {# respostas}})" @@ -8060,11 +7464,7 @@ msgstr "Denúncia enviada" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Denunciar esta conversa" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Republicado por si" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicações" +msgstr "Republicações<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Republicações desta publicação" @@ -8214,17 +7610,13 @@ msgstr "Redefinir estado da introdução" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Redefinir palavra-passe" +msgstr "Redefinir palavra-passe<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Tenta iniciar sessão novamente" @@ -8377,28 +7769,21 @@ msgstr "Diga olá!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Burla" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciência" +msgstr "Ciência<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Scroll para a esquerda" @@ -8443,11 +7828,11 @@ msgstr "Procurar por \"{interestsDisplayName}\"" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Procurar por \"{interestsDisplayName}\" (ativo)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Pesquisar por \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Procurar por \"{searchText}\"" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Procurar GIFs" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "A pesquisa está indisponível quando não tiver sessão iniciada" @@ -8565,11 +7950,7 @@ msgstr "Selecionar uma cor" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Selecione um motivo" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "A seleção de vários tipos de conteúdo multimédia não é suportada. #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Automutilação ou comportamentos perigosos" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Definir data de nascimento" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir nova palavra-passe" +msgstr "Definir nova palavra-passe<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Defina exatamente que grupos de pessoas podem responder à sua publicação" +msgstr "Defina exatamente que grupos de pessoas podem responder à sua publicação>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configure a sua conta" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Mostrar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar respostas como" +msgstr "Mostrar respostas como<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Mostrar resposta para todos" @@ -9062,13 +8423,9 @@ msgstr "Mostrar aviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar aviso e filtrar de feeds" +msgstr "Mostrar aviso e filtrar de feeds<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Mostra informação sobre quando esta publicação foi criada" @@ -9089,7 +8446,7 @@ msgstr "Mostra o conteúdo" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Origem: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; menções ou respostas excessivas" -======= -msgstr "Spam ou outros comportamentos inautênticos ou enganadores" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Sugerido para si" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo" +msgstr "Sugestivo<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Nascer do sol" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Pôr do sol" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Toque para ignorar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Assédio direcionado" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Termos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termos de Serviço" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Termos utilizados violam os padrões da comunidade" - -======= ->>>>>>> upstream/main +msgstr "Termos de Serviço<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Texto e tags" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "É tudo!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "A conta poderá interagir consigo após a desbloquear." @@ -9803,17 +9115,12 @@ msgstr "Ocorreu um problema ao contactar o servidor" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Ocorreu um problema ao contactar o servidor. Por favor, verifique a sua conexão de internet e tente novamente." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Houve um problema ao obter as notificações. Toque aqui para tentar novamente." +msgstr "Houve um problema ao obter as notificações. Toque aqui para tentar novamente.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Houve um problema ao obter as publicações. Toque aqui para tentar novamente." @@ -9852,16 +9159,9 @@ msgstr "Ocorreu um problema ao atualizar os seus feeds. Por favor, verifique a s #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Houve um problema inesperado com a aplicação. Por favor, informe-nos s #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Houve um largo influxo de novos utilizadores para o Bluesky! Iremos ativar a sua conta assim que possível." +msgstr "Houve um largo influxo de novos utilizadores para o Bluesky! Iremos ativar a sua conta assim que possível.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Estas são as suas definições padrão" ->>>>>>> upstream/main +msgstr "Estas são as suas definições padrão>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Esta lista está vazia." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Este serviço de moderação não está disponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contacto connosco." +msgstr "Este serviço de moderação não está disponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contacto connosco.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Este post afirma ter sido criado em <0>{0}, mas foi primeiro visto por Bluesky em <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Preferências de Fios" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ameaças ou incitamento" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Tópico" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traduzir" @@ -10262,11 +9541,7 @@ msgstr "Vídeos do Momento" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Desbloquear" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Desbloquear conta" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Desbloquear conta?" @@ -10406,16 +9672,8 @@ msgstr "Reverter republicação" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Reverter ({0, plural, one {# republicação} other {# republicações}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Deixar de seguir" +msgstr "Reverter ({0, plural, one {# republicação} other {# republicações}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Deixar de seguir {0}" @@ -10443,32 +9701,18 @@ msgstr "Verificador desconhecido" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Conteúdo adulto não rotulado" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Conteúdo adulto não rotulado, abusivo ou não consensual" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Remover gosto" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Remover gosto ({0, plural, one {# gosto} other {# gostos}})" @@ -10579,16 +9823,8 @@ msgstr "Removeu subscrição da lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tipo de vídeo não suportado: {mimeType}" +msgstr "Tipo de vídeo não suportado: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Conteúdo Sexual Indesejado" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Carregue um ficheiro de texto para:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Carregar da Câmara" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Carregar de Ficheiros" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Carregar da Biblioteca" @@ -10664,7 +9900,7 @@ msgstr "A carregar imagens..." msgid "Uploading link thumbnail..." msgstr "A carregar miniatura do link..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "A carregar vídeo..." @@ -10918,7 +10154,7 @@ msgstr "Vídeo não encontrado." msgid "Video settings" msgstr "Definições de vídeo" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Vídeo carregado" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Visualizar" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Ver foto de perfil de {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Veja a publicação no blog para mais detalhes" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver entrada de debug" +msgstr "Ver entrada de debug<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ver detalhes" @@ -11013,10 +10248,6 @@ msgstr "Visualizar publicação" msgid "View profile" msgstr "Ver perfil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Ver a foto de perfil" @@ -11060,15 +10291,10 @@ msgstr "Ver as contas que silenciou" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver as suas verificações" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Ver as suas verificações<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Mostra a imagem em tamanho completo" @@ -11078,24 +10304,16 @@ msgstr "Visualiza vídeo no modo imersivo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Conteúdo violento ou ameaçador>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violência" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Conteúdo violento ou ameaçador" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Lamentamos, mas não conseguimos resolver esta lista. Se isto persistir, msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Pedimos desculpa, mas não conseguimos carregar as suas palavras silenciadas neste momento. Por favor, tente novamente." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Lamentamos, mas não foi possível concluir a sua pesquisa. Por favor, tente novamente em alguns minutos." @@ -11346,11 +10564,7 @@ msgstr "Por que motivo está a recorrer?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Porque deve esta conversa ser revista?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Por que motivo deve este utilizador ser revisto?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Deseja bloquear este utilizador e/ou eliminar esta conversa?" ->>>>>>> upstream/main +msgstr "Deseja bloquear este utilizador e/ou eliminar esta conversa?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Iniciou sessão com uma palavra-passe de aplicação. Por favor, inicie #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Já recorreu deste rótulo e ele está a ser revisto pela nossa equipa de moderação." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/ro/messages.po b/src/locale/locales/ro/messages.po index 4e0c13a10..5c5df101c 100644 --- a/src/locale/locales/ro/messages.po +++ b/src/locale/locales/ro/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {urmăritor} few {urmăritori} other {de urmăritori}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {urmărit} few {urmăriți} other {de urmăriți}}" +msgstr "{0, plural, one {urmărit} few {urmăriți} other {de urmăriți}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {apreciere} few {aprecieri} other {de aprecieri}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {postare} few {postări} other {de postări}}" +msgstr "{0, plural, one {postare} few {postări} other {de postări}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citat} few {citate} other {de citate}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {repostare} few {repostări} other {de repostări}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citat} few {citate} other {de citate}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {repostare} few {repostări} other {de repostări}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {salvare} few {salvări} other {de salvări}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, one {} few {+încă #}other {+încă #}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Cont)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} la {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Conectați-vă<1> sau <2>creați un cont<3> <4>pentru a căuta știri, sport, politică și tot ce se întâmplă pe Bluesky." @@ -587,11 +567,7 @@ msgstr "Despre" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportament abuziv sau discriminatoriu" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Accesibilitate" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Setări de accesibilitate" +msgstr "Setări de accesibilitate<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cont" +msgstr "Cont<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Cont blocat" @@ -669,26 +634,18 @@ msgstr "Cont amuțit de listă" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opțiuni cont" +msgstr "Opțiuni cont<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Furnizor cont" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Cont eliminat din acces rapid" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Cont deblocat" @@ -778,7 +735,7 @@ msgstr "Adăugați un alt cont" msgid "Add another post" msgstr "Adăugați o altă postare" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Adăugați o altă postare firului" @@ -889,20 +846,12 @@ msgstr "Adulți" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conținut pentru adulți" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Conținut pentru adulți" @@ -921,11 +870,7 @@ msgstr "Etichete conținut pentru adulți" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Abuz sexual asupra adulților" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "O ilustrație care arată că Bluesky selectează verificatori de încredere, iar verificatorii de încredere verifică la rândul lor conturile de utilizator individuale." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "O problemă care nu este inclusă în aceste opțiuni" @@ -1171,19 +1112,11 @@ msgstr "și" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Abuz sexual asupra animalelor" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bunăstarea animalelor" ->>>>>>> upstream/main +msgstr "Bunăstarea animalelor>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Anunț" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunțăm verificarea pe Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Comportament anti-social" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Anunțăm verificarea pe Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Oricine" ->>>>>>> upstream/main +msgstr "Oricine>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Numele parolelor de aplicație trebuie să aibă cel puțin 4 caractere" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Parole de aplicații" +msgstr "Parole de aplicații<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Parole de aplicație" @@ -1307,19 +1225,12 @@ msgstr "Contestare suspendare" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Contestați această decizie" +msgstr "Contestați această decizie<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Aspect vizual" @@ -1331,23 +1242,14 @@ msgstr "Aplicați fluxurile recomandate implicit" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplicați solicitarea de tragere" +msgstr "Aplicați solicitarea de tragere<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arhivat de la {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arhivat de la {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Postare arhivată" @@ -1416,18 +1318,11 @@ msgstr "Atribuiți subiectul pentru algoritm" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Cel puțin 8 caractere" +msgstr "Cel puțin 8 caractere<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Disponibil" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Disponibil" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Înapoi la conversații" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Activități interzise sau încălcări ale securității" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Utilizator interzis care s-a întoarce" ->>>>>>> upstream/main +msgstr "Utilizator interzis care s-a întoarce>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Începeți procesul de verificare a vârstei completând câmpurile de m #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Zi de naștere" +msgstr "Zi de naștere<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blocare" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blocare cont" @@ -1579,15 +1446,8 @@ msgstr "Blocare conturi" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocare și ștergere" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blocați și/sau ștergeți această conversație" +msgstr "Blocare și ștergere<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Listă de blocări" @@ -1607,18 +1467,14 @@ msgstr "Blocare utilizator" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocare utilizator" +msgstr "Blocare utilizator<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Blocați utilizatorul și/sau ștergeți această conversație" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blocat" @@ -1650,40 +1506,18 @@ msgstr "Blocarea este publică. Conturile blocate nu pot răspunde în firele dv #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blocarea nu va împiedica aplicarea etichetelor pe contul dvs., dar va împiedica acest cont să răspundă în firele dvs. sau să interacționeze cu dvs." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky nu poate confirma autenticitatea datei revendicate." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Blocarea nu va împiedica aplicarea etichetelor pe contul dvs., dar va împiedica acest cont să răspundă în firele dvs. sau să interacționeze cu dvs.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky nu poate confirma autenticitatea datei revendicate." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky este o rețea deschisă unde vă puteți alege furnizorul de găzduire. Dacă sunteți un dezvoltator, puteți să vă găzduiți propriul dvs. server." @@ -1735,15 +1569,9 @@ msgstr "Cărți" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Încălcarea regulilor site-ului" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Răsfoiți mai multe conturi pe pagina Explorare" @@ -1854,19 +1682,13 @@ msgstr "Cameră" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Anulați reactivarea și deconectați-vă" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Anulare căutare" +msgstr "Anulare căutare<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Nu se poate interacționa cu un utilizator blocat" @@ -1955,11 +1771,7 @@ msgstr "Dialog modificare parolă" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Modificați categoria raportului" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Cereri de conversație" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Verificați-vă inbox-ul pentru un e-mail cu codul de confirmare pentru #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Siguranța copiilor" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Conținut cu abuz sexual asupra minorilor" ->>>>>>> upstream/main +msgstr "Conținut cu abuz sexual asupra minorilor>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Închideți fereastra de bun venit" msgid "Closes password update alert" msgstr "Închideți alerta pentru actualizarea parolei" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Închide compozitorul de postări și elimină ciorna" @@ -2350,7 +2142,7 @@ msgstr "Compuneți postări de până la {0, plural, one {} few {# caractere}oth msgid "Compose reply" msgstr "Compunere răspuns" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Se comprimă videoclipul..." @@ -2472,11 +2264,7 @@ msgstr "Conținut indisponibil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conținut care promovează sau prezintă autovătămarea" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Copiere DID autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiere cod" +msgstr "Copiere cod<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Copiere DID" @@ -2756,7 +2538,7 @@ msgstr "Creare cont" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Creați un cont" @@ -2817,35 +2599,16 @@ msgstr "Particularizat" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opțiuni de personalizare" +msgstr "Opțiuni de personalizare<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Personalizați cine poate interacționa cu această postare." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Personalizați-vă experiența Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Provocări sau activități periculoase" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Substanțe periculoase sau abuz de droguri" @@ -2854,7 +2617,6 @@ msgstr "Substanțe periculoase sau abuz de droguri" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Întunecată" @@ -2891,19 +2653,13 @@ msgstr "Panou de depanare" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Conținut pentru adulți Deepfake" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Implicit" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Pictograme implicite" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Dezactivare A2F prin e-mail" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Dezactivați feedback-ul haptic" +msgstr "Dezactivați feedback-ul haptic<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Dezactivați răspunsurile în întregime>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Dezactivați răspunsurile în întregime" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Descoperiți fluxuri noi" msgid "Dismiss" msgstr "Închidere" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Închidere eroare" @@ -3271,11 +3014,8 @@ msgstr "Nu vă faceți griji! Toate mesajele existente și setările sunt salvat #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Descărcați Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Descărcare fișier CAR" +msgstr "Descărcare fișier CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Doxxing" ->>>>>>> upstream/main +msgstr "Doxxing>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "de ex. Utilizatori care răspund în mod repetat cu reclame." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tulburări de alimentație" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Editare" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Editare avatar" @@ -3693,7 +3423,7 @@ msgstr "Intrați în modul Ecran complet" msgid "Entertainment" msgstr "Divertisment" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Eroare" @@ -3714,11 +3444,11 @@ msgstr "Mesaj de eroare" msgid "Error occurred while saving file" msgstr "A apărut o eroare la salvarea fișierului" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Eroare la primirea răspunsului captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Eroare: {error}" @@ -3740,19 +3470,8 @@ msgstr "Toți" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Toate celelalte" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Mențiuni sau răspunsuri excesive" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Mesaje excesive sau nedorite" +msgstr "Toate celelalte<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Excludeți utilizatorii pe care îi urmăriți" @@ -3876,11 +3595,7 @@ msgstr "Preferințe conținut media extern" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Conținut extremist" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Nu s-a putut verifica identificatorul. Vă rugăm să încercați din no #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Cont fals sau bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Informații false despre alegeri" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Flux" @@ -4241,26 +3946,8 @@ msgstr "Finalizare" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" +msgstr "Fitness<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Negru Plat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Albastru Plat" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Alb Plat" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexibil" @@ -4271,16 +3958,7 @@ msgstr "Flexibil" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Urmărire" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Urmărire" @@ -4323,16 +4001,8 @@ msgstr "Urmăriți toate conturile" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Urmăriți înapoi" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Urmăriți înapoi" @@ -4372,13 +4042,9 @@ msgstr "Urmăritori pe care îi știți" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Urmăriți" @@ -4386,16 +4052,11 @@ msgstr "Urmăriți" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Urmăriți" +msgstr "Urmăriți<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Urmăriți pe {0}" @@ -4482,15 +4143,8 @@ msgstr "Ați uitat parola?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Eliberați-vă fluxul" +msgstr "Eliberați-vă fluxul<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Postează frecvent conținut nedorit" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "De la" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Oferiți profilului dvs. o față" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Încălcări flagrante ale legii sau ale termenilor de serviciu" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Glorificarea violenței" ->>>>>>> upstream/main +msgstr "Oferiți profilului dvs. o față<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Conținut media grafic" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Conținut violent grafic" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Comportament de seducere și manipulare a minorilor (grooming)" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hacking sau atacuri de sistem" ->>>>>>> upstream/main +msgstr "Hacking sau atacuri de sistem>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Vibrații" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Hărțuire, trolling sau intoleranță" -======= -msgstr "Hărțuire sau ură" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Activități dăunătoare sau cu risc ridicat" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Exploatarea minorilor sau punerea lor în pericol" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtag {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Discurs de ură" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Aveți un cod? <0>Faceți clic aici." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Aveți dificultăți?" +msgstr "Aveți dificultăți?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ascundere opțiuni de personalizare" +msgstr "Ascundere opțiuni de personalizare<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Ascundere liste" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ascundere postare pentru mine" @@ -5015,11 +4613,7 @@ msgstr "Cum ar trebui să deschidem acest link?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trafic de persoane" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Dacă sunteți dezvoltator, vă puteți găzdui propriul server." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Dacă încercați să vă modificați identificatorul sau adresa de e-mail, faceți acest lucru înainte de a dezactiva." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Ilegal și urgent" +msgstr "Dacă încercați să vă modificați identificatorul sau adresa de e-mail, faceți acest lucru înainte de a dezactiva.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Imagine" @@ -5113,29 +4699,15 @@ msgstr "Imagine salvată" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Imaginile nu pot fi salvate decât dacă se acordă permisiunea de a accesa biblioteca dvs. de fotografii." +msgstr "Imaginile nu pot fi salvate decât dacă se acordă permisiunea de a accesa biblioteca dvs. de fotografii.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Impersonare sau afirmații false despre identitate sau afiliere" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Impersonare, dezinformare sau afirmații false" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Impersonare" ->>>>>>> upstream/main +msgstr "Impersonare>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "În aplicație, Push, Toată lumea" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "În aplicație, Push, Persoane pe care le urmăriți" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Mesaje neadecvate sau link-uri explicite" +msgstr "În aplicație, Push, Persoane pe care le urmăriți<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Introduceți parola pentru ștergerea contului" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Introduceți codul care v-a fost trimis prin e-mail" +msgstr "Introduceți codul care v-a fost trimis prin e-mail<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interacțiune limitată" @@ -5287,7 +4844,7 @@ msgstr "Acum doar <0>{0} e aici! Adăugați mai multe persoane la pachetul msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Sunteți doar dvs. acum! Adăugați mai multe persoane la pachetul dvs. de pornire căutând mai sus." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID loc de muncă: {0}" @@ -5330,17 +4887,13 @@ msgstr "Etichetat de {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etichetat de autor." +msgstr "Etichetat de autor.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etichete" @@ -5405,17 +4958,9 @@ msgstr "Aflați mai multe" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Aflați mai multe despre verificarea vârstei" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Află mai multe despre Bluesky" +msgstr "Aflați mai multe despre verificarea vârstei<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Aflați mai multe despre găzduirea automată a SDP-ului dvs." @@ -5450,15 +4995,10 @@ msgstr "Aflați mai multe despre ce este public pe Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Aflați mai multe în <0>setările contului." +msgstr "Aflați mai multe în <0>setările contului.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Aflați mai multe." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Apreciere" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Apreciere ({0, plural, one {o apreciere} few {# aprecieri} other {# de aprecieri}})" @@ -5589,13 +5125,9 @@ msgstr "Aprecieri pentru repostările dvs." #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificări privind aprecierile postărilor dvs." +msgstr "Notificări privind aprecierile postărilor dvs.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Aprecieri la această postare" @@ -5899,49 +5431,24 @@ msgstr "Opțiuni mesaj" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesaje" +msgstr "Mesaje<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Miezul nopții" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Hărțuire minoră sau bullying" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Notificări diverse" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Cont înșelător" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Postare înșelătoare" -======= -msgstr "Conținut înșelător" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Instrumente de moderare" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderatorul a decis să seteze un avertisment general asupra acestui conținutului." +msgstr "Moderatorul a decis să seteze un avertisment general asupra acestui conținutului.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Mai multe fluxuri" @@ -6150,18 +5652,8 @@ msgstr "Fluxurile mele" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nume" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Numele sau descrierea încalcă Standardele Comunități" - -======= ->>>>>>> upstream/main +msgstr "Nume<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Nici o imagine" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Încă nu există aprecieri" +msgstr "Încă nu există aprecieri<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Nu mai urmăriți pe {0}" @@ -6386,7 +5873,7 @@ msgstr "Niciun mesaj încă" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Gata cu algoritmii plini cu informații inutile. Găsiți fluxuri care funcționează pentru dvs., nu împotriva dvs." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Nu există notificări încă!" @@ -6440,9 +5927,9 @@ msgstr "Nu s-au găsit rezultate" msgid "No results found for \"{query}\"" msgstr "Niciun rezultat găsit pentru „{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Niciun rezultat găsit pentru „{query}”" @@ -6482,11 +5969,7 @@ msgstr "Nimeni nu a fost găsit. Încercați să căutați pe altcineva." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Imagini intime neconsensuale" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Acum" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuditate" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nuditate sau conținut pentru adulți care nu este etichetat ca atare" +msgstr "Nuditate<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okay" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Deschideți meniul sertar" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Deschideți selectorul de emoji" @@ -6815,7 +6287,7 @@ msgstr "Deschide compozitorul" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Deschide galeria dispozitivului pentru a selecta până la {MAX_IMAGES, plural, one {} few {# imagini}other {# de imagini}}, sau un singur videoclip sau GIF." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Deschide selectorul de emoji" @@ -6855,15 +6327,10 @@ msgstr "Deschide formularul de resetare a parolei" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Deschide setările de limbă pentru postări" +msgstr "Deschide setările de limbă pentru postări<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Deschide acest profil" @@ -6897,12 +6364,7 @@ msgstr "Status OTA: Nimic disponibil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Alt ceva" @@ -6912,35 +6374,8 @@ msgstr "Alt cont" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Alte probleme legate de siguranța copiilor" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Alt conținut periculos" @@ -6963,8 +6398,7 @@ msgstr "Alte conținuturi privind violența sexuală" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Alt conținut violent" ->>>>>>> upstream/main +msgstr "Alt conținut violent>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Persoane care urmăresc @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Persoane pe care le urmăriți" +msgstr "Persoane pe care le urmăriți<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Persoane pe care le urmăriți" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Persoane pe care le menționați" +msgstr "Persoane pe care le menționați>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Permisiunea de a vă accesa biblioteca de fotografii a fost refuzată. Vă rugăm să o activați în setările sistemului." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Postare" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Postare" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Postați-le pe toate" @@ -7341,19 +6768,12 @@ msgstr "Postare ștearsă" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Postarea nu a putut fi încărcată. Vă rugăm să vă verificați conexiunea la internet și să încercați din nou." +msgstr "Postarea nu a putut fi încărcată. Vă rugăm să vă verificați conexiunea la internet și să încercați din nou.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Postarea a fost ștearsă" @@ -7487,13 +6907,9 @@ msgstr "Politica de Confidențialitate" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Încălcarea confidențialității unui minor" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Se procesează videoclipul..." @@ -7521,15 +6937,11 @@ msgstr "Profil actualizat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Promovarea sau vânzarea de articole sau servicii interzise" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! Puteți edita cine poate interacționa cu această postare." ->>>>>>> upstream/main +msgstr "Psst! Puteți edita cine poate interacționa cu această postare.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Liste publice, care pot fi folosite pentru a dirija fluxuri." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicați postarea" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicați postările" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicați răspunsurile" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicați răspunsul" @@ -7622,13 +7034,9 @@ msgstr "Postări citat dezactivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citate" +msgstr "Citate<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citatele acestei postări" @@ -7689,12 +7097,12 @@ msgstr "Citiți Termenii de Serviciu Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Eliminare atașament" msgid "Remove Avatar" msgstr "Eliminare avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Eliminare banner" @@ -7960,17 +7368,13 @@ msgstr "Răspunsuri dezactivate" msgid "Replies to this post are disabled." msgstr "Răspunsurile la această postare sunt dezactivate." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Răspundeți" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Răspundeți ({0, plural, one {# răspuns} few {# răspunsuri} other {# de răspunsuri}})" @@ -8060,11 +7464,7 @@ msgstr "Raport trimis" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Raportați această conversație" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Repostat de dvs." #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repostări" +msgstr "Repostări<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Repostări ale acestei postări" @@ -8214,17 +7610,13 @@ msgstr "Resetare stare înregistrare" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Resetați parola" +msgstr "Resetați parola<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Reîncearcă conectarea" @@ -8377,32 +7769,21 @@ msgstr "Spuneți salut!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD -<<<<<<< HEAD msgstr "" -======= -msgstr "Scam" ->>>>>>> upstream/main -======= -msgstr "Înșelătorie" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Știință" +msgstr "Știință<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Derulați spre stânga" @@ -8447,11 +7828,11 @@ msgstr "Căutați „{interestsDisplayName}”" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Căutați „{interestsDisplayName}”(activ)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Căutați „{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Căutați „{searchText}”" @@ -8476,7 +7857,7 @@ msgid "Search GIFs" msgstr "Căutați GIF-uri" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Căutarea nu este disponibilă în prezent când sunteți deconectat" @@ -8569,11 +7950,7 @@ msgstr "Selectați o culoare" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Selectați un motiv" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8710,11 +8087,7 @@ msgstr "Selectarea mai multor tipuri de conținut media nu este acceptată." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Comportamente periculoase sau autovătămare" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8784,19 +8157,12 @@ msgstr "Setați data nașterii" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Setați parola nouă" +msgstr "Setați parola nouă<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Stabiliți cu precizie grupurile de persoane care pot răspunde la postarea dvs." +msgstr "Stabiliți cu precizie grupurile de persoane care pot răspunde la postarea dvs.>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Configurați-vă contul" @@ -8948,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9038,15 +8400,10 @@ msgstr "Afișați răspunsurile" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Afișați răspunsurile ca" +msgstr "Afișați răspunsurile ca<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Afișați răspunsul pentru toată lumea" @@ -9066,13 +8423,9 @@ msgstr "Afișare avertisment" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Afișează avertismente și filtrează din fluxuri" +msgstr "Afișează avertismente și filtrează din fluxuri<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Afișează informații despre când a fost creată această postare" @@ -9093,7 +8446,7 @@ msgstr "Afișează conținutul" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9300,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Sursa: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; mențiuni sau răspunsuri excesive" -======= -msgstr "Spam sau alt comportament inautentic sau înșelăciune" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9473,23 +8813,9 @@ msgstr "Sugerat pentru dvs." #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestiv" +msgstr "Sugestiv<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Răsărit" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Apus de soare" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9561,11 +8887,7 @@ msgstr "Atingeți pentru a închide" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hărțuire vizată" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9611,18 +8933,8 @@ msgstr "Termeni" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termenii de Serviciu" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Termenii folosiți încalcă standardele comunității" - -======= ->>>>>>> upstream/main +msgstr "Termenii de Serviciu<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Text & etichete" @@ -9671,11 +8983,7 @@ msgid "That's everything!" msgstr "Asta e tot!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Contul va putea interacționa cu dvs. după deblocare." @@ -9807,17 +9115,12 @@ msgstr "A apărut o problemă la contactarea serverului" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "A apărut o problemă la contactarea serverului, vă rugăm să vă verificați conexiunea la internet și încercați din nou." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "A apărut o problemă la preluarea notificărilor. Atingeți aici pentru a încerca din nou." +msgstr "A apărut o problemă la preluarea notificărilor. Atingeți aici pentru a încerca din nou.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "A apărut o problemă la preluarea postărilor. Atingeți aici pentru a încerca din nou." @@ -9856,16 +9159,9 @@ msgstr "A apărut o problemă la actualizarea fluxurilor dvs., vă rugăm să v #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9893,21 +9189,15 @@ msgstr "A apărut o problemă neașteptată în aplicație. Vă rugăm să ne sp #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Au fost o grămadă de utilizatori noi pe Bluesky! Vă vom activa contul cât mai curând posibil." +msgstr "Au fost o grămadă de utilizatori noi pe Bluesky! Vă vom activa contul cât mai curând posibil.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Acestea sunt setările dvs. implicite" ->>>>>>> upstream/main +msgstr "Acestea sunt setările dvs. implicite>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10059,13 +9349,9 @@ msgstr "Această listă este goală." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Acest serviciu de moderare nu este disponibil. Consultați mai jos pentru mai multe detalii. Dacă problema persistă, contactați-ne." +msgstr "Acest serviciu de moderare nu este disponibil. Consultați mai jos pentru mai multe detalii. Dacă problema persistă, contactați-ne.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Această postare pretinde că a fost creată pe <0>{0}, dar a fost văzută prima dată de Bluesky pe <1>{1}." @@ -10183,11 +9469,7 @@ msgstr "Preferințe fire" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Amenințări sau incitări" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10237,17 +9519,10 @@ msgstr "Subiect" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Traducere" @@ -10266,11 +9541,7 @@ msgstr "Videoclipuri în tendințe" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolling" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10373,22 +9644,13 @@ msgstr "Deblocare" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Deblocare cont" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Deblocare cont?" @@ -10410,16 +9672,8 @@ msgstr "Anulare repostare" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Refacere repostare ({0, plural, one {o repostare} few {# repostări} other {# de repostări}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Nu mai urmăriți" +msgstr "Refacere repostare ({0, plural, one {o repostare} few {# repostări} other {# de repostări}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Nu mai urmăriți pe {0}" @@ -10447,32 +9701,18 @@ msgstr "Verificator necunoscut" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Conținut pentru adulți care nu este etichetat ca atare" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Conținut pentru adulți care nu este etichetat ca atare, abuziv sau neconsensual" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Nu mai apreciați" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Nu mai apreciați ({0, plural, one {o apreciere} few {# aprecieri} other {# de aprecieri}})" @@ -10583,16 +9823,8 @@ msgstr "Dezabonat de la listă" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tip videoclip neacceptat: {mimeType}" +msgstr "Tip videoclip neacceptat: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Conținut sexual nedorit" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10642,20 +9874,20 @@ msgstr "Încărcați un fișier text la:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Încărcați de la cameră" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Încărcați din fișiere" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Încărcați din bibliotecă" @@ -10668,7 +9900,7 @@ msgstr "Se încarcă imaginile..." msgid "Uploading link thumbnail..." msgstr "Se încarcă miniatura link-ului..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Se încarcă videoclipul..." @@ -10922,7 +10154,7 @@ msgstr "Videoclipul nu a fost găsit." msgid "Video settings" msgstr "Setări videoclip" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Videoclip încărcat" @@ -10947,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Vizualizare" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Vizualizați avatarul lui {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10973,15 +10209,10 @@ msgstr "Vizualizați postarea pe blog pentru mai multe detalii" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vizualizați intrarea de depanare" +msgstr "Vizualizați intrarea de depanare<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Vizualizare detalii" @@ -11017,10 +10248,6 @@ msgstr "Vizualizare postare" msgid "View profile" msgstr "Vizualizați profilul" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Vizualizați avatarul" @@ -11064,15 +10291,10 @@ msgstr "Vizualizați conturile dvs. amuțite" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vizualizați-vă verificările" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Vizualizați-vă verificările<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Vizualizează imaginea completă" @@ -11082,24 +10304,16 @@ msgstr "Vizualizează videoclipul în modul imersiv" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Conținut violent sau amenințător>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Violență" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Conținut violent sau amenințător" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11249,7 +10463,7 @@ msgstr "Ne pare rău, dar nu am reușit să rezolvăm această listă. Dacă pro msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Ne pare rău, dar nu am putut încărca cuvintele dvs. amuțite în acest moment. Vă rugăm să încercați din nou." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Ne pare rău, dar căutarea dvs. nu a putut fi finalizată. Vă rugăm să încercați din nou în câteva minute." @@ -11350,11 +10564,7 @@ msgstr "De ce faceți contestație?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "De ce ar trebui revizuită acestă conversație?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11381,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "De ce ar trebui revizuit acest utilizator?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Doriți să blocați acest utilizator sau/și să ștergeți această conversație?" ->>>>>>> upstream/main +msgstr "Doriți să blocați acest utilizator sau/și să ștergeți această conversație?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11821,11 +11026,7 @@ msgstr "V-ați conectat cu o Parolă pentru Aplicație. Vă rugăm să vă conec #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Ați depus deja o contestație împotriva acestei etichete, iar aceasta este analizată de echipa noastră de moderare." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/ru/messages.po b/src/locale/locales/ru/messages.po index 84e575b74..450064f4f 100644 --- a/src/locale/locales/ru/messages.po +++ b/src/locale/locales/ru/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {подписчик} few {подписчика} other { #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {подписка} few {подписки} other {подписок}}" +msgstr "{0, plural, one {подписка} few {подписки} other {подписок}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {лайк} few {лайка} other {лайков}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {пост} few {поста} other {постов}}" +msgstr "{0, plural, one {пост} few {поста} other {постов}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {цитирование} few {цитирования} other {цитирований}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {репост} few {репоста} other {репостов}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {цитирование} few {цитирования} other {цитирований}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {репост} few {репоста} other {репостов}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} в {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Войдите в свой аккаунт<1> или <2>создайте аккаунт<3>, <4> чтобы искать новости, спорт, политику и всё остальное, что происходит на Bluesky." @@ -611,30 +595,19 @@ msgstr "Доступность" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Настройки Доступности" +msgstr "Настройки Доступности<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Учётная запись" +msgstr "Учётная запись<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Учётная запись заблокирована" @@ -661,26 +634,18 @@ msgstr "Учётная запись игнорируется списком" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Параметры учётной записи" +msgstr "Параметры учётной записи<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Учётная запись удалена из быстрого доступа" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Учётная запись разблокирована" @@ -770,7 +735,7 @@ msgstr "Добавить другую учётную запись" msgid "Add another post" msgstr "Добавить другой пост" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Содержимое для взрослых" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Иллюстрация, показывающая, что Bluesky выбирает доверенных верификаторов, а те, в свою очередь, верифицируют учётные записи индивидуальных пользователей." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Проблема не включена в эти варианты" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Представляем верификацию на Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Антисоциальное поведение" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Представляем верификацию на Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Имена паролей приложений должны состоя #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Пароли приложений" +msgstr "Пароли приложений<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Пароли приложений" @@ -1283,19 +1225,12 @@ msgstr "Обжаловать приостановку" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Обжаловать это решение" +msgstr "Обжаловать это решение<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Оформление" @@ -1307,23 +1242,14 @@ msgstr "Применить рекомендуемые по умолчанию л #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Архивный пост от {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Архивный пост от {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Архивный пост" @@ -1392,18 +1318,11 @@ msgstr "Назначьте тему для алгоритма" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Как минимум 8 символов" +msgstr "Как минимум 8 символов<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Аврора" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "Доступен" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "Доступен" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "Начните процесс проверки возраста, зап #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Дата рождения" +msgstr "Дата рождения<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Заблокировать" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Заблокировать" @@ -1547,15 +1446,8 @@ msgstr "Заблокировать учётные записи" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Заблокировать и удалить" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Заблокировать и/или удалить эту беседу" +msgstr "Заблокировать и удалить<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Заблокировать список" @@ -1575,18 +1467,14 @@ msgstr "Заблокировать пользователя" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Заблокировать пользователя" +msgstr "Заблокировать пользователя<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Заблокировано" @@ -1618,40 +1506,18 @@ msgstr "Блокировка - это открытая информация. З #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Блокировка не помешает добавлять метки на вашу учётную запись, но она остановит возможность этой учётной записи комментировать ваши посты или взаимодействовать с вами." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky не может подтвердить подлинность заявленной даты." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Блог" +msgstr "Блокировка не помешает добавлять метки на вашу учётную запись, но она остановит возможность этой учётной записи комментировать ваши посты или взаимодействовать с вами.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky не может подтвердить подлинность заявленной даты." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky - это открытая сеть, где вы можете выбрать хостинг-провайдера. Если вы разработчик, вы можете создать свой собственный сервер." @@ -1703,13 +1569,9 @@ msgstr "Книги" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Просмотреть другие учётные записи на странице Explore" @@ -1820,19 +1682,13 @@ msgstr "Камера" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Отменить реактивацию и выйти из систем #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Отменить поиск" +msgstr "Отменить поиск<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Невозможно взаимодействовать с заблокированным пользователем" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Запросы на чат" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Клип 🐴 клоп 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Закрывает уведомление об изменении пароля" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Закрывает редактор и удаляет черновик" @@ -2304,7 +2142,7 @@ msgstr "Пишите посты длиной до {0, plural, one {# симво msgid "Compose reply" msgstr "Составить ответ" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Сжатие видео..." @@ -2534,17 +2372,11 @@ msgstr "Копировать DID автора" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Копировать код" +msgstr "Копировать код<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Копировать DID" @@ -2706,7 +2538,7 @@ msgstr "Создать учётную запись" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Создать учётную запись" @@ -2767,15 +2599,8 @@ msgstr "Пользовательский" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Настройте, кто может взаимодействовать с этим постом." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Настройте свой опыт работы с Bluesky" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Тёмная" @@ -2835,17 +2653,13 @@ msgstr "Панель отладки" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "По умолчанию" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Иконки по умолчанию" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Отключить 2FA по электронной почте" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Отключить тактильную обратную связь" +msgstr "Отключить тактильную обратную связь<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Откройте для себя новые ленты" msgid "Dismiss" msgstr "Пропустить" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Пропустить ошибку" @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Скачать Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Скачать CAR файл" +msgstr "Скачать CAR файл<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Редактировать" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Изменить фото профиля" @@ -3627,7 +3423,7 @@ msgstr "Переходит в полноэкранный режим" msgid "Entertainment" msgstr "Развлечения" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Ошибка" @@ -3648,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Произошла ошибка при сохранении файла" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Ошибка получения ответа Captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Ошибка: {error}" @@ -3674,19 +3470,8 @@ msgstr "Все" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Чрезмерные упоминания или ответы" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Чрезмерные или нежелательные сообщения" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Исключить пользователей, на которых вы подписаны" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Лента" @@ -4165,26 +3946,8 @@ msgstr "Финиш" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Фитнес" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Плоский черный" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Плоский синий" +msgstr "Фитнес<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Плоский белый" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Гибкий" @@ -4195,16 +3958,7 @@ msgstr "Гибкий" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Подписаться" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Подписаться" @@ -4247,16 +4001,8 @@ msgstr "Подписаться на все аккаунты" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Подписаться в ответ" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Подписаться в ответ" @@ -4296,13 +4042,9 @@ msgstr "Подписчики, которых вы знаете" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Подписки" @@ -4310,16 +4052,11 @@ msgstr "Подписки" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Подписки" +msgstr "Подписки<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Подписка на {0}" @@ -4406,15 +4143,8 @@ msgstr "Забыли пароль?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Освободите свою ленту" +msgstr "Освободите свою ленту<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Часто публикует неприемлемый контент" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "От" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Придайте своему профилю лицо" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Грубые нарушения закона или условий использования" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Придайте своему профилю лицо<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Тактильные ощущения" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Домогательства, троллинг или нетерпимость" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "Есть код? <0>Нажмите здесь." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Возникли проблемы?" +msgstr "Возникли проблемы?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Спрятать пост для меня" @@ -4985,17 +4677,9 @@ msgstr "Если вы разработчик, вы можете размести #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Если вы хотите изменить свой псевдоним или электронную почту, сделайте это до деактивации." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Незаконно и срочно" +msgstr "Если вы хотите изменить свой псевдоним или электронную почту, сделайте это до деактивации.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Изображение" @@ -5015,29 +4699,15 @@ msgstr "Изображение сохранено" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Изображения не могут быть сохранены, если у приложения нет разрешения на доступ к галерее." +msgstr "Изображения не могут быть сохранены, если у приложения нет разрешения на доступ к галерее.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Выдавание себя за другое лицо или ложные утверждения о личности или принадлежности" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Выдача себя за другого, дезинформация или ложные заявления" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "В приложении, Push, Все" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "В приложении, Push, Люди, на которых вы подписаны" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Неприемлемые сообщения или откровенные ссылки" +msgstr "В приложении, Push, Люди, на которых вы подписаны<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Введите пароль для удаления учётной за #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Введите код, который был отправлен вам по электронной почте" +msgstr "Введите код, который был отправлен вам по электронной почте<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Взаимодействие ограничено" @@ -5189,7 +4844,7 @@ msgstr "Сейчас это просто <0>{0} ! Добавьте боль msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Сейчас здесь только вы! Добавьте больше людей в свой стартовый набор, воспользовавшись поиском выше." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID вакансии: {0}" @@ -5232,17 +4887,13 @@ msgstr "Отмечен {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Метка добавлена автором." +msgstr "Метка добавлена автором.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Метки" @@ -5307,17 +4958,9 @@ msgstr "Узнать больше" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Узнайте больше о Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Узнайте больше о самостоятельном хостинге PDS." @@ -5352,15 +4995,10 @@ msgstr "Узнать больше о том, что является публи #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Узнать больше." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Лайк" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Лайк ({0, plural, one {# лайк} few {# лайка} other {# лайков}})" @@ -5491,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Лайки этого поста" @@ -5801,45 +5431,23 @@ msgstr "Параметры сообщений" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Сообщения" +msgstr "Сообщения<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Полночь" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Ложная учётная запись" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Ложный пост" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Инструменты модерации" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Модератор решил установить общее предупреждение на контент." +msgstr "Модератор решил установить общее предупреждение на контент.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Больше лент" @@ -6049,18 +5652,8 @@ msgstr "Мои ленты" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Имя" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Имя или описание нарушают стандарты сообщества" +msgstr "Имя<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "Нет изображения" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Пока нет лайков" +msgstr "Пока нет лайков<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Вы больше не подписаны на {0}" @@ -6285,7 +5873,7 @@ msgstr "Сообщения пока отсутствуют" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Больше никаких алгоритмов, наполненных бесполезной информацией. Найдите каналы, которые работают на вас, а не против вас." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ещё никаких уведомлений!" @@ -6339,9 +5927,9 @@ msgstr "Нет результатов" msgid "No results found for \"{query}\"" msgstr "Ничего не найдено по запросу \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Ничего не найдено по запросу \"{query}\"" @@ -6476,15 +6064,8 @@ msgstr "Сейчас" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Нагота" +msgstr "Нагота<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Нагота или материалы для взрослых не помечены соответствующим образом" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "ОК" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Хорошо" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Открыть выдвижное меню" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Открыть подборщик эмодзи" @@ -6710,7 +6287,7 @@ msgstr "Открывает редактор" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Открывает подборщик эмодзи" @@ -6750,15 +6327,10 @@ msgstr "Открывает форму сброса пароля" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Открывает этот профиль" @@ -6792,12 +6364,7 @@ msgstr "Статус OTA: Отсутствует" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Другое" @@ -6907,23 +6474,16 @@ msgstr "Люди, которые подписаны на @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Пост" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Опубликовать" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Опубликовать все" @@ -7208,19 +6768,12 @@ msgstr "Пост удалён" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Не удалось загрузить пост. Проверьте подключение к Интернету и повторите попытку." +msgstr "Не удалось загрузить пост. Проверьте подключение к Интернету и повторите попытку.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Пост был удалён" @@ -7356,7 +6909,7 @@ msgstr "Политика конфиденциальности" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Обработка видео..." @@ -7384,19 +6937,12 @@ msgstr "Профиль изменён" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Публичный" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Публичные, доступные для обмена списки, которые могут использоваться для формирования лент." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Опубликовать пост" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Опубликовать посты" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Опубликовать ответы" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Опубликовать ответ" @@ -7488,13 +7034,9 @@ msgstr "Цитирование постов отключено" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Цитаты" +msgstr "Цитаты<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Цитаты из этого поста" @@ -7555,12 +7097,12 @@ msgstr "Прочтите условия предоставления услуг msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Удалить вложение" msgid "Remove Avatar" msgstr "Удалить аватар" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Удалить баннер" @@ -7826,17 +7368,13 @@ msgstr "Ответы отключены" msgid "Replies to this post are disabled." msgstr "Ответы на этот пост отключены." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Ответить" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Ответить ({0, plural, one {# ответ} few {# ответа} other {# ответов}})" @@ -7997,13 +7535,9 @@ msgstr "Вы сделали репост" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Репосты этого поста" @@ -8076,17 +7610,13 @@ msgstr "Сбросить состояние входа в систему" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Сбросить пароль" +msgstr "Сбросить пароль<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Повторная попытка входа в систему" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Наука" +msgstr "Наука<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Искать \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Поиск \"{searchText}\"" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Поиск GIF-файлов" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8630,19 +8157,12 @@ msgstr "Добавить дату рождения" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Изменение пароля" +msgstr "Изменение пароля<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Настройте вашу учётную запись" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Показывать ответы" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Показывать ответы" +msgstr "Показывать ответы<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Показать ответы для всех" @@ -8912,13 +8423,9 @@ msgstr "Показать предупреждения" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Показать предупреждения и фильтровать из ленты" +msgstr "Показать предупреждения и фильтровать из ленты<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Показывает информацию о том, когда был создан этот пост" @@ -8939,7 +8446,7 @@ msgstr "Показывает содержимое" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Источник: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Спам" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Спам; чрезмерные упоминания или ответы" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Предложения для вас" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Неприличный" +msgstr "Неприличный<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Восход" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Закат" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Условия" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Условия использования" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Использованные термины нарушают стандарты сообщества" - -======= ->>>>>>> upstream/main +msgstr "Условия использования<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Текст и теги" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Это всё!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Учётная запись сможет взаимодействовать с вами после разблокировки." @@ -9648,17 +9115,12 @@ msgstr "При соединении с сервером возникла про msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Возникла проблема соединения с сервером, проверьте подключение к Интернету и повторите попытку." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Возникла проблема с загрузкой уведомлений. Нажмите здесь, чтобы повторить попытку." +msgstr "Возникла проблема с загрузкой уведомлений. Нажмите здесь, чтобы повторить попытку.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Возникла проблема с загрузкой постов. Нажмите здесь, чтобы повторить попытку." @@ -9697,16 +9159,9 @@ msgstr "Возникла проблема при изменении ваших #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "В приложении возникла неожиданная проб #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Произошёл наплыв новых пользователей в Bluesky! Мы активируем вашу учётную запись как только сможем." +msgstr "Произошёл наплыв новых пользователей в Bluesky! Мы активируем вашу учётную запись как только сможем.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Этот список пуст." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Данный сервис модерации недоступен. Просмотрите детали ниже. Если проблема не исчезнет, свяжитесь с нами." +msgstr "Данный сервис модерации недоступен. Просмотрите детали ниже. Если проблема не исчезнет, свяжитесь с нами.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Этот пост утверждает, что был создан <0>{0}, но впервые был замечен Bluesky <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Тема" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Перевести" @@ -10205,22 +9644,13 @@ msgstr "Разблокировать" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Разблокировать учётную запись" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Разблокировать учётную запись?" @@ -10242,16 +9672,8 @@ msgstr "Отменить репост" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Отменить репост ({0, plural, one {# репост} few {# репоста} other {# репостов}})" +msgstr "Отменить репост ({0, plural, one {# репост} few {# репоста} other {# репостов}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Отписаться" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Отписаться от {0}" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Дизлайк" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Дизлайк ({0, plural, one {# лайк} few {# лайка} other {# лайков}})" @@ -10409,16 +9823,8 @@ msgstr "Подписка на список отменена" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Нежелательное сексуальное содержимое" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Загрузить текстовый файл в:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Загрузить с камеры" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Загрузить из файлов" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Загрузить из библиотеки" @@ -10494,7 +9900,7 @@ msgstr "Загрузка изображений..." msgid "Uploading link thumbnail..." msgstr "Загрузка миниатюры ссылки..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Загрузка видео..." @@ -10748,7 +10154,7 @@ msgstr "Видео не найдено." msgid "Video settings" msgstr "Настройки видео" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Видео загружено" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Просмотреть аватар {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Посмотреть запись в блоге для получени #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Просмотреть запись для отладки" +msgstr "Просмотреть запись для отладки<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Просмотреть детали" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Просмотреть профиль" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Просмотреть аватар" @@ -10890,15 +10291,10 @@ msgstr "Просмотр отключённых учётных записей" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Просмотреть свои верификации" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Просмотреть свои верификации<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Просмотр полного изображения" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Нам очень жаль, но нам не удалось найти msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Нам очень жаль, мы не смогли сейчас загрузить ваши игнорируемые слова. Пожалуйста, попробуйте ещё раз." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Нам очень жаль, нам не удалось выполнить поиск по вашему запросу. Пожалуйста, попробуйте ещё раз через несколько минут." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Почему следует просмотреть этого пользователя?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/sv/messages.po b/src/locale/locales/sv/messages.po index 593e9daa9..cb1dbacd7 100644 --- a/src/locale/locales/sv/messages.po +++ b/src/locale/locales/sv/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {följare} other {följare}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {följd} other {följda}}" +msgstr "{0, plural, one {följd} other {följda}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {gillamarkering} other {gillamarkeringar}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {inlägg} other {inlägg}}" +msgstr "{0, plural, one {inlägg} other {inlägg}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {citat} other {citat}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {återpublicering} other {återpubliceringar}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {citat} other {citat}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {återpublicering} other {återpubliceringar}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {sparning} other {sparningar}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# till}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (konto)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} kl. {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>Logga in<1> eller <2>skapa ett konto<3> <4>för att söka efter nyheter, sport, politik och allt annat som händer på Bluesky." @@ -587,11 +567,7 @@ msgstr "Om" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kränkande eller diskriminerande beteende" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Tillgänglighet" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tillgänglighetsinställningar" +msgstr "Tillgänglighetsinställningar<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto" +msgstr "Konto<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Konto blockerat" @@ -669,26 +634,18 @@ msgstr "Konto ignorerat av lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontoalternativ" +msgstr "Kontoalternativ<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Kontoleverantör" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Konto borttaget från snabbåtkomst" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Konto avblockerat" @@ -778,7 +735,7 @@ msgstr "Lägg till ett annat konto" msgid "Add another post" msgstr "Lägg till ett ytterligare inlägg" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Lägg till ytterligare ett inlägg i tråden" @@ -889,20 +846,12 @@ msgstr "Sexuellt explicit" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Vuxeninnehåll" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Vuxeninnehåll" @@ -921,11 +870,7 @@ msgstr "Etiketter för vuxeninnehåll" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Sexuella övergrepp mot vuxna" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "En illustration som visar att Bluesky väljer betrodda verifierare, som i sin tur verifierar enskilda användarkonton." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Något problematiskt som inte omfattas av de andra alternativen" @@ -1171,19 +1112,11 @@ msgstr "och" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "Sexuella övergrepp mot djur" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Djurplågeri eller vanvård av djur" ->>>>>>> upstream/main +msgstr "Djurplågeri eller vanvård av djur>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Meddelande" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Verifiering införs på Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Antisocialt beteende" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Verifiering införs på Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Alla" ->>>>>>> upstream/main +msgstr "Alla>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Namn på applösenord måste vara minst 4 tecken långa" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Applösenord" +msgstr "Applösenord<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Applösenord" @@ -1307,19 +1225,12 @@ msgstr "Begär omprövning av avstängning" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Begär omprövning av beslutet" +msgstr "Begär omprövning av beslutet<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Utseende" @@ -1331,23 +1242,14 @@ msgstr "Tillämpa förvalda rekommenderade flöden" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Tillämpa pull request" +msgstr "Tillämpa pull request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Arkiverat från {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Arkiverat från {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arkiverat inlägg" @@ -1416,18 +1318,11 @@ msgstr "Tilldela ämne för algoritm" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Minst 8 tecken" +msgstr "Minst 8 tecken<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Norrsken" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Tillgängligt" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Tillgängligt" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Tillbaka till chattar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Förbjudna aktiviteter eller säkerhetsöverträdelser" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Användare som kringgår avstängning" ->>>>>>> upstream/main +msgstr "Användare som kringgår avstängning>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Inled ålderskontrollen med att fylla i fälten nedan." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Födelsedag" +msgstr "Födelsedag<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Blockera" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Blockera konto" @@ -1579,15 +1446,8 @@ msgstr "Blockera konton" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blockera och radera" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Blockera och/eller radera den här konversationen" +msgstr "Blockera och radera<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Blockeringslista" @@ -1607,18 +1467,14 @@ msgstr "Blockera användare" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blockera användare" +msgstr "Blockera användare<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Blockera användare och/eller radera den här konversationen" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Blockerat" @@ -1650,40 +1506,18 @@ msgstr "Blockeringar är publika. Blockerade konton kan inte svara i dina tråda #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Blockering hindrar inte att etiketter sätts på ditt konto, men det hindrar det här kontot från att svara i dina trådar eller interagera med dig." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky kan inte bekräfta äktheten av det angivna datumet." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blogg" +msgstr "Blockering hindrar inte att etiketter sätts på ditt konto, men det hindrar det här kontot från att svara i dina trådar eller interagera med dig.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky kan inte bekräfta äktheten av det angivna datumet." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky är ett öppet nätverk där du kan välja vilken tjänst som hanterar din data. Om du är utvecklare kan du också driva en egen server." @@ -1735,15 +1569,9 @@ msgstr "Böcker" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Överträdelser av webbplatsens regler" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Bläddra bland fler konton på Utforska-sidan" @@ -1854,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Avbryt återaktivering och logga ut" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Avbryt sökning" +msgstr "Avbryt sökning<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Det går inte att interagera med en blockerad användare" @@ -1955,11 +1771,7 @@ msgstr "Dialogruta för ändring av lösenord" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ändra kategori för anmälan" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Chattförfrågningar" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Titta i din inkorg efter ett e‑postmeddelande med den bekräftelsekod #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Barnsäkerhet" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Material som visar sexuella övergrepp mot barn" ->>>>>>> upstream/main +msgstr "Material som visar sexuella övergrepp mot barn>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Galopp 🐴 galopp 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Stäng välkomstfönster" msgid "Closes password update alert" msgstr "Stänger avisering om uppdatering av lösenord" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Stänger inläggsverktyget och slänger utkastet" @@ -2350,7 +2142,7 @@ msgstr "Skriv inlägg som är upp till {0, plural, other {# tecken}} långa" msgid "Compose reply" msgstr "Skriv svar" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Komprimerar videoklipp…" @@ -2472,11 +2264,7 @@ msgstr "Innehållet är inte tillgängligt" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Innehåll som beskriver, framställer eller uppmuntrar till självskadebeteende" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Kopiera författarens DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiera kod" +msgstr "Kopiera kod<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Kopiera DID" @@ -2756,7 +2538,7 @@ msgstr "Skapa konto" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Skapa ett konto" @@ -2817,35 +2599,16 @@ msgstr "Anpassad" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Anpassningsalternativ" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Ställ in vem som kan interagera med det här inlägget." +msgstr "Anpassningsalternativ<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Anpassar din upplevelse på Bluesky" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Farliga utmaningar eller aktiviteter" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Farliga substanser eller drogmissbruk" @@ -2854,7 +2617,6 @@ msgstr "Farliga substanser eller drogmissbruk" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Mörkt" @@ -2891,19 +2653,13 @@ msgstr "Felsökningspanel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Djupförfalskat vuxeninnehåll" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Förvald" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Förvalda ikoner" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "Inaktivera 2FA via e-post" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Inaktivera haptisk feedback" +msgstr "Inaktivera haptisk feedback<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Inaktivera svar helt>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Inaktivera svar helt" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Upptäck nya flöden" msgid "Dismiss" msgstr "Avvisa" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Avvisa fel" @@ -3271,11 +3014,8 @@ msgstr "Ingen fara! Alla dina befintliga meddelanden och inställningar är spar #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Ladda ner Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Ladda ner car-fil" +msgstr "Ladda ner car-fil<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Spridning av privat information (”doxxing”)" ->>>>>>> upstream/main +msgstr "Spridning av privat information (”doxxing”)>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "t.ex. Användare som hela tiden svarar med annonser." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Ätstörningar" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Redigera" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Redigera avatar" @@ -3693,7 +3423,7 @@ msgstr "Öppnar helskärm" msgid "Entertainment" msgstr "Underhållning" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Fel" @@ -3714,11 +3444,11 @@ msgstr "Felmeddelande" msgid "Error occurred while saving file" msgstr "Ett fel uppstod när filen skulle sparas" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Fel vid mottagning av captcha-svar." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Fel: {error}" @@ -3740,19 +3470,8 @@ msgstr "Alla" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Allt annat" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Orimligt många omnämnanden eller svar" +msgstr "Allt annat<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Oönskade eller orimligt många meddelanden" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Undanta användare som du följer" @@ -3876,11 +3595,7 @@ msgstr "Inställningar för extern media" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Extremistiskt innehåll" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Det gick inte att verifiera användarnamnet. Försök igen." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "Falskt konto eller bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Falsk information om val eller röstning" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Flöde" @@ -4241,26 +3946,8 @@ msgstr "Slutför" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" +msgstr "Fitness<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Matt svart" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Matt blå" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Matt vit" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Flexibelt" @@ -4271,16 +3958,7 @@ msgstr "Flexibelt" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Följ" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Följ" @@ -4323,16 +4001,8 @@ msgstr "Följ alla konton" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Följ tillbaka" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Följ tillbaka" @@ -4372,13 +4042,9 @@ msgstr "Följare som du känner" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Följer" @@ -4386,16 +4052,11 @@ msgstr "Följer" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Följer" +msgstr "Följer<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Följer {0}" @@ -4482,15 +4143,8 @@ msgstr "Glömt?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Befria ditt flöde" +msgstr "Befria ditt flöde<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Publicerar ofta oönskat innehåll" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Från" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Ge din profil ett ansikte" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Uppenbara överträdelser av lagar eller användarvillkor" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Förhärligande av våld" ->>>>>>> upstream/main +msgstr "Ge din profil ett ansikte<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,18 +4356,7 @@ msgstr "Grafiskt innehåll" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "Grafiskt våldsamt innehåll" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4731,8 +4364,7 @@ msgstr "Sexuell manipulation eller utnyttjande av barn (”grooming”)" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Intrång eller systemattacker" ->>>>>>> upstream/main +msgstr "Intrång eller systemattacker>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Haptik" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Trakasserier, trolling eller intolerans" -======= -msgstr "Trakasserier eller hat" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Skadliga eller riskfyllda aktiviteter" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Innehåll som kan skada eller utsätta minderåriga för fara" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "Hashtagg: {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hatpropaganda" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Har du en kod? <0>Klicka här." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Har du problem?" +msgstr "Har du problem?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Dölj anpassningsalternativ" +msgstr "Dölj anpassningsalternativ<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Dölj listor" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Dölj inlägg för mig" @@ -5015,11 +4613,7 @@ msgstr "Hur vill du att länken ska öppnas?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "Människohandel" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Om du är utvecklare kan du driva en egen server." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Om du försöker ändra ditt användarnamn eller din e-postadress ska du göra det innan du avaktiverar." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Olagligt och brådskande" +msgstr "Om du försöker ändra ditt användarnamn eller din e-postadress ska du göra det innan du avaktiverar.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Bild" @@ -5113,29 +4699,15 @@ msgstr "Bild sparad" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Bilder kan inte sparas om du inte har gett appen åtkomst till ditt bildbibliotek." +msgstr "Bilder kan inte sparas om du inte har gett appen åtkomst till ditt bildbibliotek.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Imitationer eller falska påståenden om identitet eller tillhörighet" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Imitation, felaktig information eller falska påståenden" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Utger sig för att vara någon annan" ->>>>>>> upstream/main +msgstr "Utger sig för att vara någon annan>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "I appen, Push, Från alla" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "I appen, Push, Från personer du följer" +msgstr "I appen, Push, Från personer du följer<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Olämpliga meddelanden eller explicita länkar" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Ange lösenord för att radera kontot" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Ange koden som har skickats till dig via e-post" +msgstr "Ange koden som har skickats till dig via e-post<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Interaktion begränsad" @@ -5287,7 +4844,7 @@ msgstr "Just nu är det bara <0>{0} ! Lägg till fler personer i ditt startp msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Just nu är det bara du! Lägg till fler personer i ditt startpaket genom att söka ovan." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Jobb-ID: {0}" @@ -5330,17 +4887,13 @@ msgstr "Markerat av {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Markerat av användaren." +msgstr "Markerat av användaren.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Etiketter" @@ -5405,17 +4958,9 @@ msgstr "Läs mer" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Läs mer om ålderskontroll" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Läs mer om Bluesky" +msgstr "Läs mer om ålderskontroll<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Läs mer om att driva din egen PDS." @@ -5450,15 +4995,10 @@ msgstr "Läs mer om vad som är publikt på Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "Läs mer i dina <0>kontoinställningar." +msgstr "Läs mer i dina <0>kontoinställningar.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Läs mer." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Gilla" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Gilla ({0, plural, one {# gillamarkering} other {# gillamarkeringar}})" @@ -5589,13 +5125,9 @@ msgstr "Gillamarkeringar på dina återpubliceringar" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notiser för gillamarkeringar på dina återpubliceringar" +msgstr "Notiser för gillamarkeringar på dina återpubliceringar<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Gillamarkeringar på det här inlägget" @@ -5899,49 +5431,24 @@ msgstr "Meddelandealternativ" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Meddelanden" +msgstr "Meddelanden<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Midnatt" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Trakasserier eller mobbning av minderårig" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Övriga notiser" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Vilseledande konto" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Vilseledande inlägg" -======= -msgstr "Vilseledande innehåll" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Modereringsverktyg" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "En moderator har valt att sätta en allmän varning på innehållet." +msgstr "En moderator har valt att sätta en allmän varning på innehållet.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Fler flöden" @@ -6150,18 +5652,8 @@ msgstr "Mina flöden" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Namn" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Namn eller beskrivning bryter mot gemenskapens riktlinjer" - -======= ->>>>>>> upstream/main +msgstr "Namn<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Ingen bild" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Inga gillamarkeringar ännu" +msgstr "Inga gillamarkeringar ännu<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} följs inte längre" @@ -6386,7 +5873,7 @@ msgstr "Inga meddelanden ännu" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Inget mer doomscrollande orsakat av skräpfyllda algoritmer. Hitta flöden som arbetar för dig – inte emot dig." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Inga notiser ännu!" @@ -6440,9 +5927,9 @@ msgstr "Inget resultat hittades" msgid "No results found for \"{query}\"" msgstr "Inget resultat hittades för ”{query}”" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Inget resultat hittades för {query}" @@ -6482,11 +5969,7 @@ msgstr "Ingen hittades. Försök med att söka efter någon annan." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Delning av privata bilder utan samtycke" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Naket" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Nakenhet eller vuxeninnehåll som inte är märkt som sådant" +msgstr "Naket<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Okej" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Öppna sidpanel" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Öppna emoji-väljaren" @@ -6815,7 +6287,7 @@ msgstr "Öppnar inläggsverktyget" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "Öppnar enhetens galleri där du kan välja upp till {MAX_IMAGES, plural, other {# bilder}}, ett enskilt videoklipp eller en enskild gif-bild." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Öppnar emojiväljaren" @@ -6855,15 +6327,10 @@ msgstr "Öppnar formulär för återställning av lösenord" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Öppnar inställningar för inläggsspråk" +msgstr "Öppnar inställningar för inläggsspråk<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Öppnar den här profilen" @@ -6897,12 +6364,7 @@ msgstr "OTA-status: Ingen tillgänglig" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Annat" @@ -6912,35 +6374,8 @@ msgstr "Annat konto" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Annat som rör barns säkerhet" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Annat farligt innehåll" @@ -6963,8 +6398,7 @@ msgstr "Annat innehåll med sexuellt våld" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Annat våldsamt innehåll" ->>>>>>> upstream/main +msgstr "Annat våldsamt innehåll>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "Personer som följer @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Personer jag följer" +msgstr "Personer jag följer<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Personer du följer" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Omnämnda" +msgstr "Omnämnda>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Åtkomst till ditt bildbibliotek nekades. Aktivera det i dina systeminställningar." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Inlägg" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Publicera" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Publicera alla" @@ -7341,19 +6768,12 @@ msgstr "Inlägg raderat" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Inlägget kunde inte laddas upp. Kontrollera din internetanslutning och försök igen." +msgstr "Inlägget kunde inte laddas upp. Kontrollera din internetanslutning och försök igen.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Inlägget har raderats" @@ -7487,13 +6907,9 @@ msgstr "Integritetspolicy" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kränkning av minderårigs integritet" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Bearbetar videoklipp…" @@ -7521,15 +6937,11 @@ msgstr "Profil uppdaterad" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Reklam för eller försäljning av otillåtna varor eller tjänster" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Psst! Du kan redigera vilka som kan interagera med det här inlägget." ->>>>>>> upstream/main +msgstr "Psst! Du kan redigera vilka som kan interagera med det här inlägget.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Publika, delningsbara listor som kan användas till att driva flöden." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Publicera inlägg" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Publicera samtliga inlägg" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Publicera svar" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Publicera samtliga svar" @@ -7622,13 +7034,9 @@ msgstr "Citatinlägg inaktiverade" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citat" +msgstr "Citat<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Citat av detta inlägg" @@ -7689,12 +7097,12 @@ msgstr "Läs Blueskys användarvillkor" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Ta bort bilaga" msgid "Remove Avatar" msgstr "Ta bort avatar" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Ta bort omslag" @@ -7960,17 +7368,13 @@ msgstr "Svar inaktiverade" msgid "Replies to this post are disabled." msgstr "Svar är inaktiverat för det här inlägget." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Svara" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Svara ({0, plural, one {# svar} other {# svar}})" @@ -8060,11 +7464,7 @@ msgstr "Anmälan skickad" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Anmäl den här konversationen" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Återpublicerat av dig" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Återpubliceringar" +msgstr "Återpubliceringar<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Återpubliceringar av det här inlägget" @@ -8214,17 +7610,13 @@ msgstr "Återställ status för kom-igång-guide" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Återställ lösenord" +msgstr "Återställ lösenord<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Gör ett nytt inloggningsförsök" @@ -8377,28 +7769,21 @@ msgstr "Säg hej!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bedrägeri eller bluff" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Vetenskap" +msgstr "Vetenskap<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Rulla åt vänster" @@ -8443,11 +7828,11 @@ msgstr "Sök efter ”{interestsDisplayName}”" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "Sök efter ”{interestsDisplayName}” (aktiv)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Sök efter ”{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Sök efter ”{searchText}”" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "Sök gif-bilder" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Sökning är för närvarande inte tillgängligt för utloggade" @@ -8565,11 +7950,7 @@ msgstr "Välj en färg" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Välj orsak" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "Val av flera medietyper stöds inte." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Självskadebeteende eller farligt beteende" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Ange födelsedatum" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ange nytt lösenord" +msgstr "Ange nytt lösenord<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Ställ in exakt vilka grupper av människor som kan svara på ditt inlägg" +msgstr "Ställ in exakt vilka grupper av människor som kan svara på ditt inlägg>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Konfigurera ditt konto" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Visa svar" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Visa svar i" +msgstr "Visa svar i<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Visa svar för alla" @@ -9062,13 +8423,9 @@ msgstr "Visa varning" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Visa varning och filtrera i flöden" +msgstr "Visa varning och filtrera i flöden<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Visar information om när det här inlägget skapades" @@ -9089,7 +8446,7 @@ msgstr "Visar innehållet" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Källa: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; överdrivet många omnämnanden eller svar" -======= -msgstr "Spam, oäkta beteende eller vilseledande innehåll" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Föreslaget åt dig" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestivt" +msgstr "Suggestivt<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Soluppgång" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Solnedgång" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Tryck för att avvisa" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Riktade trakasserier" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Villkor" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Användarvillkor" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Termer som används bryter mot gemenskapens riktlinjer" - -======= ->>>>>>> upstream/main +msgstr "Användarvillkor<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Textinnehåll och taggar" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "Det var allt!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Kontot kommer att kunna interagera med dig om du häver blockeringen." @@ -9803,17 +9115,12 @@ msgstr "Ett problem uppstod med anslutningen till servern" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Ett problem uppstod med anslutningen till servern. Kontrollera din internetanslutning och försök igen." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Ett problem uppstod med att hämta notiser. Tryck här för att försöka igen." +msgstr "Ett problem uppstod med att hämta notiser. Tryck här för att försöka igen.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Ett problem uppstod med att hämta inlägg. Tryck här för att försöka igen." @@ -9852,16 +9159,9 @@ msgstr "Ett problem uppstod med att uppdatera dina flöden. Kontrollera din inte #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Ett oväntat problem uppstod i applikationen. Låt oss veta om det drabb #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Det har varit en rusning av nya användare till Bluesky! Vi kommer att aktivera ditt konto så snart vi kan." +msgstr "Det har varit en rusning av nya användare till Bluesky! Vi kommer att aktivera ditt konto så snart vi kan.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Det här är dina förvalda inställningar" ->>>>>>> upstream/main +msgstr "Det här är dina förvalda inställningar>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Den här listan är tom." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Den här modereringstjänsten är inte tillgänglig. Se nedan för mer information. Kontakta oss om problemet kvarstår." +msgstr "Den här modereringstjänsten är inte tillgänglig. Se nedan för mer information. Kontakta oss om problemet kvarstår.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Det här inlägget har <0>{0} som angivet skapelsedatum, men registrerades på Bluesky först den <1>{1}." @@ -10179,11 +9469,7 @@ msgstr "Trådinställningar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hot eller uppmaningar till våld" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Ämne" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Översätt" @@ -10262,11 +9541,7 @@ msgstr "Trendande videoklipp" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Avsiktligt störande eller provocerande beteende (”trolling”)" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Häv blockering" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Häv blockering av konto" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Häv blockering av konto?" @@ -10406,16 +9672,8 @@ msgstr "Ångra återpublicering" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Ångra återpublicering ({0, plural, one {# återpublicering} other {# återpubliceringar}})" +msgstr "Ångra återpublicering ({0, plural, one {# återpublicering} other {# återpubliceringar}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Sluta följ" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Sluta följ {0}" @@ -10443,32 +9701,18 @@ msgstr "Okänd verifierare" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Omarkerat vuxeninnehåll" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Vuxeninnehåll som inte har markerats, är kränkande eller delas utan samtycke" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Sluta gilla" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Sluta gilla ({0, plural, one {# gillamarkering} other {# gillamarkeringar}})" @@ -10579,16 +9823,8 @@ msgstr "Avslutade prenumeration på lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Videotypen stöds inte: {mimeType}" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Oönskat sexuellt innehåll" +msgstr "Videotypen stöds inte: {mimeType}<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Ladda upp en textfil till:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Ladda upp från Kamera" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Ladda upp från Filer" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Ladda upp från Bibliotek" @@ -10664,7 +9900,7 @@ msgstr "Laddar upp bilder…" msgid "Uploading link thumbnail..." msgstr "Laddar upp miniatyrbild av länk…" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Laddar upp video…" @@ -10918,7 +10154,7 @@ msgstr "Videoklippet hittades inte." msgid "Video settings" msgstr "Inställningar för videoklipp" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Videoklipp uppladdat" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Visa" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Visa {0}s avatar" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Se blogginlägget för mer information" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Visa loggpost" +msgstr "Visa loggpost<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Visa detaljer" @@ -11013,10 +10248,6 @@ msgstr "Visa inlägg" msgid "View profile" msgstr "Visa profil" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Visa avataren" @@ -11060,15 +10291,10 @@ msgstr "Visa de konton du har ignorerat" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Visa dina verifieringar" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Visa dina verifieringar<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Visar hela bilden" @@ -11078,24 +10304,16 @@ msgstr "Visar videoklipp i uppslukande läge" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Våldsamt eller hotfullt innehåll>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Våld" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Våldsamt eller hotfullt innehåll" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Vi beklagar, men vi kunde inte läsa in den här listan. Om det här kva msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Vi beklagar, men vi kunde inte läsa in dina ignorerade ord just nu. Försök igen." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Vi beklagar, men din sökning kunde inte slutföras. Försök igen om några minuter." @@ -11346,11 +10564,7 @@ msgstr "Varför begär du omprövning?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Varför borde den här konversationen granskas?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Varför borde den här användaren granskas?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Vill du blockera den här användaren och/eller radera den här konversationen?" ->>>>>>> upstream/main +msgstr "Vill du blockera den här användaren och/eller radera den här konversationen?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11815,10 +11024,6 @@ msgstr "Nu är du redo att börja!" msgid "You're signed in with an App Password. Please sign in with your main password to continue deactivating your account." msgstr "Du är inloggad med ett applösenord. Logga in med ditt vanliga lösenord för att fortsätta inaktiveringen av ditt konto." -#: src/components/moderation/LabelsOnMeDialog.tsx:261 -msgid "You've already appealed this label and it's being reviewed by our moderation team." -msgstr "Du har redan begärt omprövning av den här etiketten som nu granskas av vårt modereringsteam." - #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." msgstr "" diff --git a/src/locale/locales/th/messages.po b/src/locale/locales/th/messages.po index d337881f7..8ff15d397 100644 --- a/src/locale/locales/th/messages.po +++ b/src/locale/locales/th/messages.po @@ -98,21 +98,16 @@ msgstr "" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "การเข้าถึง" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "การตั้งค่าการเข้าถึง" +msgstr "การตั้งค่าการเข้าถึง<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "บัญชี" +msgstr "บัญชี<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "บัญชีถูกบล็อก" @@ -661,26 +634,18 @@ msgstr "บัญชีถูกปิดเสียงโดยลิสต์ #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "ตัวเลือกบัญชี" +msgstr "ตัวเลือกบัญชี<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "ลบบัญชีออกจากการเข้าถึงด่วนแล้ว" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "ปลดบล็อกบัญชีแล้ว" @@ -770,7 +735,7 @@ msgstr "" msgid "Add another post" msgstr "" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "เนื้อหาสำหรับผู้ใหญ่ (18+)" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "ปัญหาที่ไม่ได้รวมอยู่ในตัวเลือกเหล่านี้" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "พฤติกรรมต่อต้านสังคม" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "รหัสผ่านแอป" +msgstr "รหัสผ่านแอป<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "รหัสผ่านแอป" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "อุทธรณ์การตัดสินใจนี้" +msgstr "อุทธรณ์การตัดสินใจนี้<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "รูปลักษณ์" @@ -1307,23 +1242,14 @@ msgstr "ใช้ฟีดที่แนะนำตามค่าเริ่ #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "วันเกิด" +msgstr "วันเกิด<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "บล็อก" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "บล็อกบัญชี" @@ -1546,15 +1446,8 @@ msgstr "บล็อกบัญชี" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "ลิสต์บล็อก" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "ถูกบล็อก" @@ -1617,40 +1506,18 @@ msgstr "การบล็อกเป็นสาธารณะ บัญช #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "การบล็อกจะไม่ป้องกันไม่ให้ป้ายถูกวางบนบัญชีของคุณ แต่จะหยุดบัญชีนี้จากการตอบในกระทู้ของคุณหรือมีปฏิสัมพันธ์กับคุณ" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "บล็อก" +msgstr "การบล็อกจะไม่ป้องกันไม่ให้ป้ายถูกวางบนบัญชีของคุณ แต่จะหยุดบัญชีนี้จากการตอบในกระทู้ของคุณหรือมีปฏิสัมพันธ์กับคุณ<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky เป็นเครือข่ายเปิดที่คุณสามารถเลือกผู้ให้บริการโฮสติ้งของคุณได้ หากคุณเป็นนักพัฒนา คุณสามารถโฮสต์เซิร์ฟเวอร์ของคุณเองได้" @@ -1702,13 +1569,9 @@ msgstr "หนังสือ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "เรียกดูบัญชีเพิ่มเติมในหน้าค้นหา" @@ -1819,19 +1682,13 @@ msgstr "" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "ยกเลิกการเปิดใช้งานใหม่แ #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "ยกเลิกการค้นหา" +msgstr "ยกเลิกการค้นหา<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "ไม่สามารถโต้ตอบกับผู้ใช้ที่ถูกบล็อก" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "ปิดการแจ้งเตือนการอัปเดตรหัสผ่าน" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "สร้างการตอบกลับ" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "" @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "คัดลอกโค้ด" +msgstr "คัดลอกโค้ด<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "" @@ -2705,7 +2538,7 @@ msgstr "สร้างบัญชี" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "สร้างบัญชี" @@ -2766,15 +2599,8 @@ msgstr "กำหนดเอง" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" - -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "กำหนดผู้ที่สามารถโต้ตอบกับโพสต์นี้ได้" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "มืด" @@ -2834,17 +2653,13 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "ค่าเริ่มตัน" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "ปิดการยืนยันตัวตนสองชั้น #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "ปิดการตอบสนองแบบสั่น" +msgstr "ปิดการตอบสนองแบบสั่น<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "ค้นพบฟีดใหม่" msgid "Dismiss" msgstr "ปิด" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "ปิดข้อผิดพลาด" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "ดาวน์โหลด Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "ดาวน์โหลดไฟล์ CAR" +msgstr "ดาวน์โหลดไฟล์ CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "แก้ไข" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "แก้ไขรูปประจำตัว" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "เกิดข้อผิดพลาดในขณะที่บันทึกไฟล์" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "เกิดข้อผิดพลาดการตอบสนองของ Captcha" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "ทุกคน" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "เมนชั่นหรือตอบกลับที่เกินความจำเป็น" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "ข้อความที่เกินความจำเป็น" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "ไม่รวมผู้ใช้ที่คุณติดตาม" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "ฟีด" @@ -4164,26 +3946,8 @@ msgstr "เสร็จสิ้น" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "ฟิตเนส" +msgstr "ฟิตเนส<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "ยืดหยุ่น" @@ -4194,16 +3958,7 @@ msgstr "ยืดหยุ่น" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "ติดตาม" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "ติดตาม" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "ติดตามคุณกลับ" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "ติดตามคุณกลับ" @@ -4295,13 +4042,9 @@ msgstr "ผู้ติดตามที่คุณรู้จัก" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "ติดตาม" @@ -4309,16 +4052,11 @@ msgstr "ติดตาม" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "ติดตาม" +msgstr "ติดตาม<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "ติดตาม {0}" @@ -4405,15 +4143,8 @@ msgstr "ลืมเหรอ?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "โพสต์เนื้อหาที่ไม่ต้องการบ่อยครั้ง" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "ทำให้โปรไฟล์ของคุณมีความน่าสนใจขึ้น" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "การละเมิดกฎหมายหรือข้อกำหนดในการให้บริการ" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "ทำให้โปรไฟล์ของคุณมีความน่าสนใจขึ้น<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "การสัมผัส" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "การล่วงละเมิด การกลั่นแกล้ง หรือการไม่ยอมรับการอยู่ร่วมกันในสังคม" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "มีปัญหาใช่ไหม?" +msgstr "มีปัญหาใช่ไหม?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "ซ่อนโพสต์สำหรับฉัน" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "หากคุณพยายามเปลี่ยนแฮนด์เดิ้ลของคุณ ให้ทำการเปลี่ยนก่อนที่คุณจะหยุดใช้งานบัญชีนี้" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "ผิดกฏหมายและเร่งด่วน" +msgstr "หากคุณพยายามเปลี่ยนแฮนด์เดิ้ลของคุณ ให้ทำการเปลี่ยนก่อนที่คุณจะหยุดใช้งานบัญชีนี้<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "รูปภาพ" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "การแอบอ้างหรือการกล่าวอ้างที่ผิดเกี่ยวกับตัวตนหรือความสัมพันธ์" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "การแอบอ้าง, ข้อมูลที่ผิดพลาด, หรือการกล่าวอ้างที่ผิด" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "ข้อความที่ไม่เหมาะสมหรือการเชื่อมโยงที่ชัดเจน" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "กรอกรหัสผ่านสำหรับการลบบ #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "กรอกรหัสที่ถูกส่งไปยังอีเมลของคุณ" +msgstr "กรอกรหัสที่ถูกส่งไปยังอีเมลของคุณ<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "การโต้ตอบถูกจำกัด" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "ตอนนี้มีแค่คุณแล้ว! เพิ่มผู้คนในชุดเริ่มต้นของคุณโดยการค้นหาด้านบนนี้" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "" @@ -5231,17 +4887,13 @@ msgstr "มาร์คโดย {0}" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "มาร์คโดยผู้สร้าง" +msgstr "มาร์คโดยผู้สร้าง<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "มาร์คไว้" @@ -5306,17 +4958,9 @@ msgstr "เรียนรู้เพิ่มเติม" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "เรียนรู้เพิ่มเติมเกี่ยวกับ Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "เรียนรู้เพิ่มเติมเกี่ยวกับการโฮสต์ข้อมูลด้วยตัวเอง (PDS)" @@ -5351,15 +4995,10 @@ msgstr "เรียนรู้เพิ่มเติมเกี่ยวก #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "เรียนรู้เพิ่มเติม" @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "ชอบในโพสต์นี้" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "ข้อความ" +msgstr "ข้อความ<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "บัญชีที่ทำให้เข้าใจผิด" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "โพสต์ที่ทำให้เข้าใจผิด" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "เครื่องมือการกรอง" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "ผู้ดูแลระบบเลือกที่จะตั้งคำเตือนทั่วไปบนเนื้อหา" +msgstr "ผู้ดูแลระบบเลือกที่จะตั้งคำเตือนทั่วไปบนเนื้อหา<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "ฟีตเพิ่มเติม" @@ -6047,18 +5652,8 @@ msgstr "ฟีตของฉัน" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "ชื่อ" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "ชื่อหรือคำอธิบายได้ละเมิดมาตรฐานชุมชน" - -======= ->>>>>>> upstream/main +msgstr "ชื่อ<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "ยังไม่มีสิ่งที่ชอบ" +msgstr "ยังไม่มีสิ่งที่ชอบ<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "ไม่ติดตาม {0} อีกต่อไป" @@ -6283,7 +5873,7 @@ msgstr "ยังไม่มีข้อความ" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "ยังไม่มีการแจ้งเตือน!" @@ -6337,9 +5927,9 @@ msgstr "ไม่พบผลลัพธ์" msgid "No results found for \"{query}\"" msgstr "ไม่พบผลลัพธ์สำหรับ \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "ไม่พบผลลัพธ์สำหรับ {query}" @@ -6474,15 +6064,8 @@ msgstr "ตอนนี้" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "การโป๊เปลือย" +msgstr "การโป๊เปลือย<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "การโป๊เปลือยหรือเนื้อหาผู้ใหญ่ที่ไม่ระบุไว้" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "ตกลง" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "ตกลง" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "เปิดการเลือกอีโมจิ" @@ -6708,7 +6287,7 @@ msgstr "เปิด composer" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "เปิดการรีเซ็ตรหัสผ่าน" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "เปิดโปรไฟล์นี้" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "อื่น ๆ" @@ -6905,23 +6474,16 @@ msgstr "ผู้คนที่ติดตาม @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "โพสต์" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "โพสต์" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "" @@ -7206,19 +6768,12 @@ msgstr "โพสต์ถูกลบแล้ว" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "นโยบายความเป็นส่วนตัว" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "" @@ -7382,19 +6937,12 @@ msgstr "โปรไฟล์ได้รับการอัปเดต" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "สาธารณะ" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "ยกเลิกการโควท" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "โควท" +msgstr "โควท<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "โควทโพสต์นี้" @@ -7553,12 +7097,12 @@ msgstr "อ่านนโยบาย เงื่อนไข และ ข้ msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "ลบไฟล์แนบ" msgid "Remove Avatar" msgstr "ลบอวาตาร์" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "ลบแบนด์เนอร์" @@ -7824,17 +7368,13 @@ msgstr "ปิดการตอบกลับแล้ว" msgid "Replies to this post are disabled." msgstr "การตอบกลับโพสต์นี้ถูกปิด" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "การตอบกลับ" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "รีโพสต์โดยคุณ" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "รีโพสต์ของโพสต์นี้" @@ -8074,17 +7610,13 @@ msgstr "รีเซ็ตสถานะการเริ่มต้นใช #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "รีเซ็ตรหัสผ่าน" +msgstr "รีเซ็ตรหัสผ่าน<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "วิทยาศาสตร์" +msgstr "วิทยาศาสตร์<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "ค้นหาจาก \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "การค้นหาสำหรับ \"{query}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "ค้นหา GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "ตั้งเดือนเกิด" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "ตั้งรหัสผ่านใหม่" +msgstr "ตั้งรหัสผ่านใหม่<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "ตั้งค่าบัญชีของคุณ" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "แสดงการตอบกลับสำหรับทุกคน" @@ -8910,13 +8423,9 @@ msgstr "แสดงคำเตือน" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "แสดงคำเตือนและกรองจากฟีด" +msgstr "แสดงคำเตือนและกรองจากฟีด<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "สแปม" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "สแปม; การกล่าวถึงหรือการตอบกลับที่มากเกินไป" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "แนะนำสำหรับคุณ" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "ชี้นำ" +msgstr "ชี้นำ<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "เงื่อนไข" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "เงื่อนไขการให้บริการ" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "คำที่ใช้ละเมิดมาตรฐานชุมชน" - -======= ->>>>>>> upstream/main +msgstr "เงื่อนไขการให้บริการ<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "ข้อความและแท็ก" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "บัญชีจะสามารถโต้ตอบกับคุณได้หลังจากที่ปลดบล็อกแล้ว" @@ -9646,17 +9115,12 @@ msgstr "เกิดปัญหาในการติดต่อเซิร msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "เกิดปัญหาในการดึงการแจ้งเตือน คลิกที่นี่เพื่อลองอีกครั้ง" +msgstr "เกิดปัญหาในการดึงการแจ้งเตือน คลิกที่นี่เพื่อลองอีกครั้ง<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "เกิดปัญหาในการดึงโพสต์ คลิกที่นี่เพื่อลองอีกครั้ง" @@ -9695,16 +9159,9 @@ msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "เกิดปัญหาไม่คาดคิดในแอปพ #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "มีผู้ใช้ใหม่เข้ามาที่ Bluesky เป็นจำนวนมาก! เราจะรีบเปิดใช้งานบัญชีของคุณอย่างเร็วที่สุด" +msgstr "มีผู้ใช้ใหม่เข้ามาที่ Bluesky เป็นจำนวนมาก! เราจะรีบเปิดใช้งานบัญชีของคุณอย่างเร็วที่สุด<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "" @@ -10071,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "" @@ -10203,22 +9644,13 @@ msgstr "ปลดบล็อก" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "ปลดบล็อกบัญชี" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "ปลดบล็อกบัญชีหรือไม่?" @@ -10240,16 +9672,8 @@ msgstr "ยกเลิกการแชร์ซ้ำ" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "เลิกติดตาม" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "เลิกติดตาม {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "เลิกสมัครรับข้อมูลจากลิส #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "เนื้อหาทางเพศที่ไม่พึงประสงค์" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "อัปโหลดไฟล์ข้อความไปที่:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "อัปโหลดจากกล้อง" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "อัปโหลดจากไฟล์" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "อัปโหลดจากไลบรารี" @@ -10492,7 +9900,7 @@ msgstr "" msgid "Uploading link thumbnail..." msgstr "" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "" @@ -10746,7 +10154,7 @@ msgstr "ไม่พบวิดีโอ" msgid "Video settings" msgstr "การตั้งค่าวิดีโอ" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "ดูอวตาร์ของ {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "ดูบล็อกโพสต์สำหรับรายละเ #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "ดูลิสต์ดีบัก" +msgstr "ดูลิสต์ดีบัก<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "ดูรายละเอียด" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "ดูโปรไฟล์" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "ดูอวตาร์" @@ -10888,15 +10291,10 @@ msgstr "ดูบัญชีที่คุณปิดเสียง" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "ขออภัย เราไม่สามารถแก้ไข msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "ขออภัย เราไม่สามารถโหลดคำที่คุณปิดเสียงในขณะนี้ โปรดลองอีกครั้ง" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "ขออภัย การค้นหาของคุณไม่สามารถเสร็จสมบูรณ์ได้ โปรดลองอีกครั้งในไม่กี่นาที" @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "ทำไมผู้ใช้คนนี้จึงควรได้รับการตรวจสอบ?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/tr/messages.po b/src/locale/locales/tr/messages.po index e8c26a2f9..680435787 100644 --- a/src/locale/locales/tr/messages.po +++ b/src/locale/locales/tr/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, other {takipçi}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, other {takip edilen}}" +msgstr "{0, plural, other {takip edilen}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {beğeni}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {gönderi}}" +msgstr "{0, plural, other {gönderi}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {alıntı}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {yeniden gönderi}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {alıntı}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {yeniden gönderi}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, other {kaydedilme}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+# daha}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0} (Hesap)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<4>Bluesky'da haber, spor, siyaset ve diğer olan biteni aramak için<3> <0>giriş yapın<1> veya <2>bir hesap oluşturun." @@ -587,11 +567,7 @@ msgstr "Hakkında" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "İstismar edici ya da ayrımcı davranış" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "Erişilebilirlik" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Erişilebilirlik Ayarları" +msgstr "Erişilebilirlik Ayarları<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Hesap" +msgstr "Hesap<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Hesap engellendi" @@ -669,26 +634,18 @@ msgstr "Liste Tarafından Hesap Susturuldu" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Hesap seçenekleri" +msgstr "Hesap seçenekleri<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "Hesap sağlayıcısı" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Hesap hızlı erişimden kaldırıldı" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Hesap engeli kaldırıldı" @@ -778,7 +735,7 @@ msgstr "Başka hesap ekle" msgid "Add another post" msgstr "Başka gönderi ekle" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "Konuya yeni bir gönderi ekle" @@ -889,20 +846,12 @@ msgstr "Yetişkin" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Yetişkin içerik" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Yetişkin İçerik" @@ -921,11 +870,7 @@ msgstr "Yetişkin İçerik işaretleri" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Yetişkin cinsel istismarı içeriği" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Bluesky'ın güvenilir doğrulayıcıları seçmesini ve güvenilir doğrulayıcıların da bireysel hesapları doğrulamasını gösteren bir çizim." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Bu seçeneklerde yer almayan bir sorun" @@ -1171,19 +1112,11 @@ msgstr "ve" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "" -======= -msgstr "Hayvan cinsel istismarı" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" -msgstr "Hayvan istismarı" ->>>>>>> upstream/main +msgstr "Hayvan istismarı>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "Duyuru" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky'da doğrulamayı duyurma" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Anti-Sosyal Davranış" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Bluesky'da doğrulamayı duyurma<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "Herkes" ->>>>>>> upstream/main +msgstr "Herkes>>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "Uygulama şifresi isimleri en az 4 karakter uzunluğunda olmalıdır" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Uygulama şifreleri" +msgstr "Uygulama şifreleri<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Uygulama Şifreleri" @@ -1307,19 +1225,12 @@ msgstr "Askıya Alınmaya İtiraz Et" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Bu karara itiraz et" +msgstr "Bu karara itiraz et<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Görünüm" @@ -1331,23 +1242,14 @@ msgstr "Önerilen öntanımlı akışları uygula" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Pull Request'i uygula" +msgstr "Pull Request'i uygula<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "{0} kaynağından arşivlendi" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "{0} kaynağından arşivlendi" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Arşivlenmiş gönderi" @@ -1416,18 +1318,11 @@ msgstr "Algoritmaya başlık ata" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "En az 8 karakter" +msgstr "En az 8 karakter<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Kuzey Işıkları" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "Kullanılabilir" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "Kullanılabilir" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "Sohbetlere Geri Dön" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "Yasak eylemler ya da güvenlik ihlalleri" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "Uzaklaştırılmış kullanıcının geri gelmesi" ->>>>>>> upstream/main +msgstr "Uzaklaştırılmış kullanıcının geri gelmesi>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "Aşağıdaki alanları doldurarak yaş güvencesi işlemine başlayın." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Doğum günü" +msgstr "Doğum günü<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Engelle" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Hesabı engelle" @@ -1579,15 +1446,8 @@ msgstr "Hesapları engelle" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Engelle ve Sil" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Engelle ve/veya bu yazışmayı sil" +msgstr "Engelle ve Sil<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Listeyi engelle" @@ -1607,18 +1467,14 @@ msgstr "Kullanıcıyı engelle" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Kullanıcıyı Engelle" +msgstr "Kullanıcıyı Engelle<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "Kullanıcıyı engelle ve/veya bu yazışmayı sil" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Engellendi" @@ -1650,40 +1506,18 @@ msgstr "Engelleme herkese açıktır. Engellenen hesaplar, konularınıza yanıt #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Engellemeniz hesabınıza işaretlerin uygulanmasını önlemeyecektir fakat bu hesabın sizin konularınıza yanıt vermesini ya da sizle etkileşime geçmesini önleyecektir." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky iddia edilen tarihin doğruluğunu onaylayamaz." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Engellemeniz hesabınıza işaretlerin uygulanmasını önlemeyecektir fakat bu hesabın sizin konularınıza yanıt vermesini ya da sizle etkileşime geçmesini önleyecektir.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky iddia edilen tarihin doğruluğunu onaylayamaz." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Klasik™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky, barındırma sağlayıcınızı seçebileceğiniz açık bir ağdır. Geliştiriciyseniz kendi sunucunuzu barındırabilirsiniz." @@ -1735,15 +1569,9 @@ msgstr "Kitaplar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "Site kurallarını ihlal" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Keşfet sayfasında daha fazla kullanıcı bul" @@ -1854,19 +1682,13 @@ msgstr "Kamera" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "Yeniden etkinleştirmeyi iptal et ve çıkış yap" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Aramayı iptal et" +msgstr "Aramayı iptal et<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Engellenen kullanıcıya etkileşime geçilemez" @@ -1955,11 +1771,7 @@ msgstr "Şifre değiştirme diyaloğu" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "Rapor kategorisini değiştir" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "Sohbet istekleri" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "Aşağıya gireceğiniz onay kodu içeren bir e-posta için gelen kutunu #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "Çocuk güvenliği" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Çocuk Cinsel İstismarı Materyali (CSAM)" ->>>>>>> upstream/main +msgstr "Çocuk Cinsel İstismarı Materyali (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Klip 🐴 klop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "Hoşgeldiniz ekranını kapat" msgid "Closes password update alert" msgstr "Şifre güncelleme uyarısını kapatır" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Gönderi düzenleyiciyi kapatır ve gönderi taslağını siler" @@ -2350,7 +2142,7 @@ msgstr "{0, plural, other {# karakter}} uzunluğuna kadar gönderiler oluşturun msgid "Compose reply" msgstr "Yanıt oluştur" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Video sıkıştırılıyor..." @@ -2472,11 +2264,7 @@ msgstr "İçerik Mevcut Değil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kendine zarar vermeyi özendiren ya da betimleyen içerik" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "Yazar DID'ini kopyala" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kodu kopyala" +msgstr "Kodu kopyala<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "DID'i kopyala" @@ -2756,7 +2538,7 @@ msgstr "Hesap Oluştur" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Bir hesap oluştur" @@ -2817,35 +2599,16 @@ msgstr "Özel" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Özelleştirme seçenekleri" +msgstr "Özelleştirme seçenekleri<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Bu gönderiyle kimin etkileşime geçebileceğini özelleştirin." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Bluesky deneyiminizi özelleştirir" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "Tehlikeli meydan okumalar veya eylemler" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "Tehlikeli maddeler veya uyuşturucu istismarı" @@ -2854,7 +2617,6 @@ msgstr "Tehlikeli maddeler veya uyuşturucu istismarı" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Karanlık" @@ -2891,19 +2653,13 @@ msgstr "Hata ayıklama paneli" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Deepfake yetişkin içerik" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Varsayılan" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "Varsayılan simgeler" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "E-posta ile iki adımlı doğrulamayı devre dışı bırak" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Dokunsal geribildirimi devre dışı bırak" +msgstr "Dokunsal geribildirimi devre dışı bırak<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "Yanıtları tümden devre dışı bırak>>>>>>> upstream/main" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,19 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" -msgstr "Yanıtları tümden devre dışı bırak" ->>>>>>> upstream/main +msgstr "=======" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3183,7 +2926,7 @@ msgstr "Yeni Akışlar Keşfet" msgid "Dismiss" msgstr "Yok say" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Hatayı yok say" @@ -3271,11 +3014,8 @@ msgstr "Merak etmeyin! Tüm mesajlarınız ve ayarlarınız saklandı ve bir yet #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3323,9 +3063,8 @@ msgstr "Bluesky'ı İndir" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR dosyasını indir" +msgstr "CAR dosyasını indir<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3348,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "Özel bilgi ifşası" ->>>>>>> upstream/main +msgstr "Özel bilgi ifşası>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3397,11 +3131,7 @@ msgstr "örn: Reklamlarla tekrar tekrar yanıt veren kullanıcılar." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "Yeme bozuklukları" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3418,7 +3148,7 @@ msgid "Edit" msgstr "Düzenle" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Avatarı düzenle" @@ -3693,7 +3423,7 @@ msgstr "Tam ekrana geçer" msgid "Entertainment" msgstr "Eğlence" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Hata" @@ -3714,11 +3444,11 @@ msgstr "Hata mesajı" msgid "Error occurred while saving file" msgstr "Dosya kaydedilirken bir hata oluştu" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Captcha yanıtı alınırken bir hata oldu." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Hata: {error}" @@ -3740,19 +3470,8 @@ msgstr "Herkes" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Geri kalan her şey" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Çok fazla sayıda bahsetme ya da yanıt" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Çok fazla sayıda ya da istenmeyen mesajlar" +msgstr "Geri kalan her şey<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Takip ettiğim kullanıcıları hariç tut" @@ -3876,11 +3595,7 @@ msgstr "Harici Medya Tercihleri" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "Aşırılıkçı içerik" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4084,23 +3799,13 @@ msgstr "Kullanıcı adı doğrulanamadı. Lütfen yeniden deneyin." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "Sahte hesap ya da bot" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "Seçimler hakkında yanlış bilgi" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "Akış" @@ -4241,26 +3946,8 @@ msgstr "Bitir" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness" +msgstr "Fitness<<<<<<< HEAD=======" -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Düz Siyah" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Düz Mavi" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Düz Beyaz" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Esnek" @@ -4271,16 +3958,7 @@ msgstr "Esnek" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Takip et" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Takip et" @@ -4323,16 +4001,8 @@ msgstr "Tüm hesapları takip et" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Geri takip et" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Geri takip et" @@ -4372,13 +4042,9 @@ msgstr "Tanıdığın takipçiler" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Takip ediliyor" @@ -4386,16 +4052,11 @@ msgstr "Takip ediliyor" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Takiptekiler" +msgstr "Takiptekiler<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "{0} takip ediliyor" @@ -4482,15 +4143,8 @@ msgstr "Unuttunuz mu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Akışınızı özgürleştirin" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Sıkça İstenmeyen İçerik Gönderiyor" +msgstr "Akışınızı özgürleştirin<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "Kimden" @@ -4591,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Profilinize bir yüz ekleyin" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Yasa veya hizmet şartlarının açık ihlalleri" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "Şiddete övgü" ->>>>>>> upstream/main +msgstr "Profilinize bir yüz ekleyin<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4712,27 +4356,15 @@ msgstr "Sarsıcı Olabilecek Medya" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "Açık şiddet içeren içerik" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "Reşit olmayanlara yönelik cinsel yönlendirme ya da sarkıntılık davranışı" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "Hack'leme ya da sistem saldırıları" ->>>>>>> upstream/main +msgstr "Hack'leme ya da sistem saldırıları>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4763,24 +4395,8 @@ msgstr "Dokunuş" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Taciz, trolleme veya hoşgörüsüzlük" -======= -msgstr "Taciz veya nefret" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "Zararlı ya da yüksek riskli eylemler" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "Küçüklere zarar verme ya da tehlikeye atma" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4799,11 +4415,7 @@ msgstr "{tag} etiketi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "Nefret söylemi" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4812,15 +4424,10 @@ msgstr "Kodunuz var mı? <0>Buraya tıklayın." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Sorun mu yaşıyorsunuz?" +msgstr "Sorun mu yaşıyorsunuz?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4879,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Özelleştirme seçeneklerini gizle" +msgstr "Özelleştirme seçeneklerini gizle<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "Listeleri gizle" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Gönderiyi benim için gizle" @@ -5015,11 +4613,7 @@ msgstr "Bu bağlantıyı nasıl açmalıyız?" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "İnsan kaçakçılığı" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5083,17 +4677,9 @@ msgstr "Eğer bir geliştiriciyseniz kendi sunucunuzu barındırabilirsiniz." #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Eğer kullanıcı adınızı veya e-postanızı değiştirmeye çalışıyorsanız, bunu devre dışı bırakmadan önce yapın." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Yasadışı ve Acil" +msgstr "Eğer kullanıcı adınızı veya e-postanızı değiştirmeye çalışıyorsanız, bunu devre dışı bırakmadan önce yapın.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Resim" @@ -5113,29 +4699,15 @@ msgstr "Görsel kaydedildi" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Fotoğraf galerinize erişim izni verilmedikçe görseller kaydedilemez." +msgstr "Fotoğraf galerinize erişim izni verilmedikçe görseller kaydedilemez.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Kimlik veya kurumsal ilişkilerle ilgili sahtecilik veya yanlış beyanlar" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Kimlik dolandırıcılığı, yanlış bilgilendirme veya yanlış iddialar" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "Kendini başkası olarak tanıtma" ->>>>>>> upstream/main +msgstr "Kendini başkası olarak tanıtma>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5163,15 +4735,8 @@ msgstr "Uygulama içi, Anında, Herkes" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Uygulama içi, Anında, Takip ettikleriniz" +msgstr "Uygulama içi, Anında, Takip ettikleriniz<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Uygunsuz mesajlar veya sakıncalı olabilecek web bağlantıları" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5199,21 +4764,13 @@ msgstr "Hesap silme için şifre girin" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Size e-posta olarak gönderilen kodu girin" +msgstr "Size e-posta olarak gönderilen kodu girin<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Etkileşim sınırlandırıldı" @@ -5287,7 +4844,7 @@ msgstr "Şu anda sadece <0>{0}! Yukarıda arama yaparak başlangıç paketin msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Şu anda yalnızca siz varsınız! Yukarıdan arama yaparak başlangıç ​​paketinize daha çok kişi ekleyin." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "İş ID: {0}" @@ -5330,17 +4887,13 @@ msgstr "{0} tarafından işaretlendi." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Yazarı tarafından işaretlendi." +msgstr "Yazarı tarafından işaretlendi.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "İşaretler" @@ -5405,17 +4958,9 @@ msgstr "Daha Fazla Bilgi Edinin" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Yaş güvencesiyle ilgili daha çok bilgi edinin" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Bluesky hakkında daha fazlasını öğren" +msgstr "Yaş güvencesiyle ilgili daha çok bilgi edinin<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "PDS'nizi kendiniz barındırmayla ilgili daha çok bilgi edinin." @@ -5450,15 +4995,10 @@ msgstr "Bluesky'da neyin herkese açık olduğu hakkında daha fazla bilgi edini #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<0>Hesap ayarlarınızdan daha çok bilgi edinin." +msgstr "<0>Hesap ayarlarınızdan daha çok bilgi edinin.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Daha fazlasını öğren." @@ -5522,11 +5062,7 @@ msgid "Like" msgstr "Beğen" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Beğen ({0, plural, other {# beğeni}})" @@ -5589,13 +5125,9 @@ msgstr "Yeniden gönderilerinize dair beğeniler" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Yeniden gönderilerinize dair beğenilerin bildirimleri" +msgstr "Yeniden gönderilerinize dair beğenilerin bildirimleri<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Bu gönderideki beğeniler" @@ -5899,49 +5431,24 @@ msgstr "Mesaj seçenekleri" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesajlar" +msgstr "Mesajlar<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Gece yarısı" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "Küçüklere taciz ya da kabadayılık" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "Diğer bildirimler" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Yanıltıcı Hesap" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Yanıltıcı Gönderi" -======= -msgstr "Yanıltıcı" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6001,15 +5508,10 @@ msgstr "Moderasyon araçları" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Moderatör, içeriğe genel bir uyarı koymayı seçti." +msgstr "Moderatör, içeriğe genel bir uyarı koymayı seçti.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Daha fazla akış" @@ -6150,18 +5652,8 @@ msgstr "Akışlarım" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ad" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "İsim ya da Açıklama Topluluk Standartlarını İhlal Etmektedir" - -======= ->>>>>>> upstream/main +msgstr "Ad<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6365,16 +5857,11 @@ msgstr "Görsel yok" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Henüz beğeni yok" +msgstr "Henüz beğeni yok<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "{0} artık takip edilmiyor" @@ -6386,7 +5873,7 @@ msgstr "Henüz mesaj yok" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "Çöp dolu algoritmalarla felaket kaydırmalarına son! Size karşı değil, sizin için çalışan akışları bulun." -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Henüz bildirim yok!" @@ -6440,9 +5927,9 @@ msgstr "Sonuç bulunamadı" msgid "No results found for \"{query}\"" msgstr "\"{query}\" için sonuç bulunamadı" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "{query} için sonuç bulunamadı" @@ -6482,11 +5969,7 @@ msgstr "Kimse bulunamadı. Başka birini aramayı deneyin." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "Rızasız mahrem görseller" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6581,15 +6064,8 @@ msgstr "Şimdi" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Çıplaklık" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Çıplaklık içeren veya yetişkin içerik o şekilde işaretlenmemiş" +msgstr "Çıplaklık<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6610,11 +6086,7 @@ msgid "OK" msgstr "Tamam" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Tamam" @@ -6715,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Çekmece menüyü aç" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Emoji seçiciyi aç" @@ -6815,7 +6287,7 @@ msgstr "Besteciyi açar" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "{MAX_IMAGES, plural, other {# adede kadar}} görsel veya tek bir video ya da GIF seçmek için cihaz galerisini açar." -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Emoji seçiciyi açar" @@ -6855,15 +6327,10 @@ msgstr "Şifre sıfırlama formunu açar" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Gönderi dili ayarlarını açar" +msgstr "Gönderi dili ayarlarını açar<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Bu profili açar" @@ -6897,12 +6364,7 @@ msgstr "Güncelleme durumu: Hiç yok" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Diğer" @@ -6912,35 +6374,8 @@ msgstr "Diğer hesap" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "Başka bir çocuk güvenliği meselesi" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "Başka bir tehlikeli içerik" @@ -6963,8 +6398,7 @@ msgstr "Başka bir cinsel şiddet içeriği" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "Başka bir şiddet içeriği" ->>>>>>> upstream/main +msgstr "Başka bir şiddet içeriği>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7040,23 +6474,16 @@ msgstr "@{0} tarafından takip edilenler" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "Takip ettiklerim" +msgstr "Takip ettiklerim<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "Takip ettiğiniz kişiler" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Bahsettiğiniz kişiler" +msgstr "Bahsettiğiniz kişiler>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "Fotoğraf galerinize erişim izni reddedildi. Lütfen sistem ayarlarınızdan etkinleştirin." @@ -7313,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Gönderi" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Gönder" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Hepsini Gönder" @@ -7341,19 +6768,12 @@ msgstr "Gönderi silindi" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Gönderinin yollanması başarısız. Lütfen İnternet bağlantınızı kontrol edin ve tekrar deneyin." +msgstr "Gönderinin yollanması başarısız. Lütfen İnternet bağlantınızı kontrol edin ve tekrar deneyin.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Gönderi silindi" @@ -7487,13 +6907,9 @@ msgstr "Gizlilik Politikası" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bir küçüğün gizliliğini ihlal" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Video işleniyor..." @@ -7521,15 +6937,11 @@ msgstr "Profil güncellendi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD msgstr "" -======= -msgstr "Yasaklı madde veya hizmet reklamı ya da satışı" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "Hişt! Bu gönderiyle kimin etkileşebileceğini düzenleyebilirsiniz." ->>>>>>> upstream/main +msgstr "Hişt! Bu gönderiyle kimin etkileşebileceğini düzenleyebilirsiniz.>>>>>>> upstream/main" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7544,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Akışları ilerletebilmek için herkese açık, paylaşılabilir listeler." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Gönderiyi yayınla" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Gönderileri yayınla" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Yanıtları yayınla" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Yanıtı yayınla" @@ -7622,13 +7034,9 @@ msgstr "Alıntı gönderilen devre dışı bırakıldı" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Alıntılar" +msgstr "Alıntılar<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Bu gönderinin alıntıları" @@ -7689,12 +7097,12 @@ msgstr "Bluesky Hizmet Şartlarını Oku" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7785,8 +7193,8 @@ msgstr "Eki kaldır" msgid "Remove Avatar" msgstr "Avatarı kaldır" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Kapağı Kaldır" @@ -7960,17 +7368,13 @@ msgstr "Yanıtlara kapalı" msgid "Replies to this post are disabled." msgstr "Bu gönderi yanıtlara kapalı." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Yanıtla" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Yanıtla ({0, plural, other {# yanıt}})" @@ -8060,11 +7464,7 @@ msgstr "Rapor yollandı" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bu yazışmayı raporla" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8135,13 +7535,9 @@ msgstr "Siz yeniden göndermişsiniz" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Yeniden gönderiler" +msgstr "Yeniden gönderiler<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Bu gönderinin yeniden gönderilmesi" @@ -8214,17 +7610,13 @@ msgstr "Onboarding durumunu sıfırla" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Şifreyi sıfırla" +msgstr "Şifreyi sıfırla<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Giriş yapmayı tekrar dener" @@ -8377,28 +7769,21 @@ msgstr "Merhaba de!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "Dolandırıcılık" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Bilim" +msgstr "Bilim<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "Sola kaydır" @@ -8443,11 +7828,11 @@ msgstr "\"{interestsDisplayName}\" ara" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "\"{interestsDisplayName}\" ara (etkin)" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "\"{query}\" için ara" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "\"{searchText}\" ara" @@ -8472,7 +7857,7 @@ msgid "Search GIFs" msgstr "GIF aratın" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "Arama şu anda giriş yapmamış kullanıcıların erişimine kapalıdır" @@ -8565,11 +7950,7 @@ msgstr "Renk seç" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bir gerekçe seçiniz" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8706,11 +8087,7 @@ msgstr "Farklı türlerde medya seçimi desteklenmemektedir." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "Kendine zarar verme veya tehlikeli davranışlar" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8780,19 +8157,12 @@ msgstr "Doğum tarihini belirle" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Yeni şifre ayarla" +msgstr "Yeni şifre ayarla<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "Gönderinize hangi kişi gruplarının yanıt verebileceğini net bir şekilde belirleyin" +msgstr "Gönderinize hangi kişi gruplarının yanıt verebileceğini net bir şekilde belirleyin>>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Hesabınızı ayarlayın" @@ -8944,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9034,15 +8400,10 @@ msgstr "Yanıtları göster" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Yanıtları şöyle göster" +msgstr "Yanıtları şöyle göster<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Yanıtı herkese göster" @@ -9062,13 +8423,9 @@ msgstr "Uyarı göster" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Uyarı göster ve akışlardan filtrele" +msgstr "Uyarı göster ve akışlardan filtrele<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Bu gönderinin ne zaman oluşturulduğuna dair bilgileri gösterir" @@ -9089,7 +8446,7 @@ msgstr "İçeriği gösterir" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9296,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "Kaynak: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; çok sık bahsetme ya da yanıtlama" -======= -msgstr "Spam veya başka bir samimiyetsiz davranış veya kandırma" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9469,23 +8813,9 @@ msgstr "Size önerilenler" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Tehlikeli" +msgstr "Tehlikeli<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Gün doğumu" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Gün batımı" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9557,11 +8887,7 @@ msgstr "Gizlemek için dokunun" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "Hedefli taciz" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9607,18 +8933,8 @@ msgstr "Şartlar" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Hizmet Şartları" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Kullanılan terimler topluluk standartlarını ihlal etmektedir" - -======= ->>>>>>> upstream/main +msgstr "Hizmet Şartları<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Metin ve etiketler" @@ -9667,11 +8983,7 @@ msgid "That's everything!" msgstr "Hepsi bu kadar!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Hesap, engeli kaldırdıktan sonra sizinle etkileşime geçebilecek." @@ -9803,17 +9115,12 @@ msgstr "Sunucuya ulaşma konusunda bir sorun oluştu" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Sunucuya bağlanırken bir sorun oldu, lütfen internet bağlantınızı kontrol edin ve tekrar deneyin." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Bildirimleri almakta bir sorun oluştu. Tekrar denemek için buraya dokunun." +msgstr "Bildirimleri almakta bir sorun oluştu. Tekrar denemek için buraya dokunun.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Gönderileri almakta bir sorun oluştu. Tekrar denemek için buraya dokunun." @@ -9852,16 +9159,9 @@ msgstr "Akışlarınızı güncellerken bir sorun oldu, lütfen internet bağlan #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9889,21 +9189,15 @@ msgstr "Uygulamada beklenmeyen bir sorun oluştu. Bu size de olduysa lütfen biz #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Bluesky'e bir dizi yeni kullanıcı geldi! Hesabınızı en kısa sürede etkinleştireceğiz." +msgstr "Bluesky'e bir dizi yeni kullanıcı geldi! Hesabınızı en kısa sürede etkinleştireceğiz.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" -msgstr "Bunlar varsayılan ayarlarınız" ->>>>>>> upstream/main +msgstr "Bunlar varsayılan ayarlarınız>>>>>>> upstream/main" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." +msgstr "=======" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -10055,13 +9349,9 @@ msgstr "Bu liste boş." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Bu moderasyon hizmeti kullanılamıyor. Daha fazla ayrıntı için aşağıya bakın. Bu sorun devam ederse bizimle iletişime geçin." +msgstr "Bu moderasyon hizmeti kullanılamıyor. Daha fazla ayrıntı için aşağıya bakın. Bu sorun devam ederse bizimle iletişime geçin.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Bu gönderi <0>{0} tarihinde oluşturulduğunu beyan ediyor, ancak Bluesky'da ilk olarak <1>{1} tarihinde görüldü." @@ -10179,11 +9469,7 @@ msgstr "Konu Tercihleri" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "Tehditler ya da kışkırtma" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10233,17 +9519,10 @@ msgstr "Konu başlığı" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Çevir" @@ -10262,11 +9541,7 @@ msgstr "Gündemdeki Videolar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "Trolleme" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10369,22 +9644,13 @@ msgstr "Engeli kaldır" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Hesabın engelini kaldır" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Hesabı Engelle?" @@ -10406,16 +9672,8 @@ msgstr "Yeniden göndermeyi geri al" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Yeniden gönderiyi geri al ({0, plural, other {# yeniden gönderi}})" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Takibi bırak" +msgstr "Yeniden gönderiyi geri al ({0, plural, other {# yeniden gönderi}})<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "{0} adresini takibi bırak" @@ -10443,32 +9701,18 @@ msgstr "Bilinmeyen doğrulayıcı" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "Etiketlenmemiş yetişkin içerik" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "Etiketlenmemiş, istismarcı veya rızasız yetişkin içerik" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Beğenmeyi geri al" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Beğeniyi kaldır ({0, plural, other {# beğeni}})" @@ -10579,16 +9823,8 @@ msgstr "Liste aboneliğinden çıktınız" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Desteklenmeyen video türü: {mimeType}" +msgstr "Desteklenmeyen video türü: {mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "İstenmeyen Cinsel İçerik" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10638,20 +9874,20 @@ msgstr "Bir metin dosyası yükleyin:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Kameradan Yükle" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Dosyalardan Yükle" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Kütüphaneden Yükle" @@ -10664,7 +9900,7 @@ msgstr "Resimler yükleniyor..." msgid "Uploading link thumbnail..." msgstr "Web bağlantısının görseli gönderiliyor..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Video yükleniyor..." @@ -10918,7 +10154,7 @@ msgstr "Video bulunamadı." msgid "Video settings" msgstr "Video ayarları" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Video yüklendi" @@ -10943,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "Göz at" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "{0}'ın avatarını görüntüle" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10969,15 +10209,10 @@ msgstr "Daha fazla detay için blog yazısını gör" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Hata ayıklama girişini görüntüle" +msgstr "Hata ayıklama girişini görüntüle<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Ayrıntıları görüntüle" @@ -11013,10 +10248,6 @@ msgstr "Gönderiyi göster" msgid "View profile" msgstr "Profili görüntüle" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Avatarı görüntüle" @@ -11060,15 +10291,10 @@ msgstr "Sessize aldığınız hesapları görün" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Doğrulamalarınızı görüntüleyin" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Doğrulamalarınızı görüntüleyin<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Görseli tam boy gösterir" @@ -11078,24 +10304,16 @@ msgstr "Videoyu içine dalınan modda gösterir" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "Şiddet veya tehditkâr içerik>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "Şiddet" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "Şiddet veya tehditkâr içerik" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11245,7 +10463,7 @@ msgstr "Üzgünüz, ancak bu listeyi çözemedik. Bu durum devam ederse, lütfen msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Üzgünüz, ancak sessize alınmış kelimelerinizi şu anda yükleyemedik. Lütfen tekrar deneyin." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Üzgünüz, ancak aramanız tamamlanamadı. Lütfen birkaç dakika içinde tekrar deneyin." @@ -11346,11 +10564,7 @@ msgstr "Neden itiraz ediyorsunuz?" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "Bu yazışma neden gözden geçirilmeli?" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "Bu kullanıcı neden gözden geçirilmeli?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "Bu kullanıcıyı engellemek ve/veya bu yazışmayı silmek ister misiniz?" ->>>>>>> upstream/main +msgstr "Bu kullanıcıyı engellemek ve/veya bu yazışmayı silmek ister misiniz?>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11817,11 +11026,7 @@ msgstr "Bir Uygulama Şifresi ile giriş yaptınız. Lütfen hesabınızı devre #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "Bu etikete zaten itiraz etmiştiniz; denetim ekibimiz tarafından gözden geçirilmektedir." ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/uk/messages.po b/src/locale/locales/uk/messages.po index 55e7d67b9..511164526 100644 --- a/src/locale/locales/uk/messages.po +++ b/src/locale/locales/uk/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {підписник} few {підписники} many {п #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {читаю} few {читаю} many {читаю} other {читаю}}" +msgstr "{0, plural, one {читаю} few {читаю} many {читаю} other {читаю}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {вподобайка} few {вподобайки} many {вподобайки} other {вподобайки}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {пост} few {пости} many {постів} other {постів}}" +msgstr "{0, plural, one {пост} few {пости} many {постів} other {постів}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {цитата} few {цитати} many {цитати} other {цитата}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {репост} few {репости} many {репостів} other {репостів}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {цитата} few {цитати} many {цитати} other {цитата}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {репост} few {репости} many {репостів} other {репостів}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} о {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Доступність" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Налаштування доступності" +msgstr "Налаштування доступності<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Обліковий запис" +msgstr "Обліковий запис<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Обліковий запис заблоковано" @@ -661,26 +634,18 @@ msgstr "Обліковий запис ігноровано списком" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Параметри облікового запису" +msgstr "Параметри облікового запису<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Обліковий запис вилучено зі швидкого доступу" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Обліковий запис розблоковано" @@ -770,7 +735,7 @@ msgstr "Додати інший обліковий запис" msgid "Add another post" msgstr "Написати ще" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Вміст для дорослих" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Проблема не включена до цих варіантів" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Антисоціальна поведінка" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Назва повинна бути не менше 4 символів у #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Паролі застосунку" +msgstr "Паролі застосунку<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Паролі для застосунків" @@ -1283,19 +1225,12 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Оскаржити це рішення" +msgstr "Оскаржити це рішення<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Оформлення" @@ -1307,23 +1242,14 @@ msgstr "Застосувати рекомендовані стрічки за з #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Архівовано {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Архівовано {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Архівований пост" @@ -1392,16 +1318,10 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" ->>>>>>> upstream/main msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 @@ -1416,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1431,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1496,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Дата народження" +msgstr "Дата народження<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1506,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Заблокувати" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Заблокувати обліковий запис" @@ -1546,15 +1446,8 @@ msgstr "Заблокувати облікові записи" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Заблокувати список" @@ -1574,18 +1467,14 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Заблоковано" @@ -1617,40 +1506,18 @@ msgstr "Блокування - це відкрита інформація. За #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Блокування не завадить додавання міток до вашого облікового запису, але це зупинить можливість цього облікового запису від коментування ваших постів чи взаємодії з вами." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky не може підтвердити автентичність зазначеної дати." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Блог" +msgstr "Блокування не завадить додавання міток до вашого облікового запису, але це зупинить можливість цього облікового запису від коментування ваших постів чи взаємодії з вами.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky не може підтвердити автентичність зазначеної дати." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky — відкрита мережа, в якій ви можете обрати свого хостинг-провайдера. Якщо ви розробник, ви можете розмістити свій власний сервер." @@ -1702,13 +1569,9 @@ msgstr "Книги" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Переглянути більше облікових записів на сторінці Відкриття" @@ -1819,19 +1682,13 @@ msgstr "Камера" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1859,17 +1716,11 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Скасувати пошук" +msgstr "Скасувати пошук<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Не можна взаємодіяти із заблокованим користувачем" @@ -1982,11 +1833,7 @@ msgid "Chat requests" msgstr "" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2149,19 +1996,11 @@ msgstr "Тик 🐴 тигидик 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2231,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Закриває сповіщення про оновлення пароля" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "" @@ -2303,7 +2142,7 @@ msgstr "" msgid "Compose reply" msgstr "Відповісти" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Стискання відео..." @@ -2533,17 +2372,11 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Скопіювати код" +msgstr "Скопіювати код<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Копіювати ідентифікатор" @@ -2705,7 +2538,7 @@ msgstr "Створити обліковий запис" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Створити обліковий запис" @@ -2766,15 +2599,8 @@ msgstr "Користувацький" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Налаштуйте, хто може взаємодіяти з цим постом." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "" @@ -2785,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Темна" @@ -2834,17 +2653,13 @@ msgstr "Панель налагодження" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Типово" @@ -2853,17 +2668,10 @@ msgid "Default icons" msgstr "" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3026,20 +2834,26 @@ msgstr "Вимкнути двофакторну автентифікацію е #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Вимкнути тактильний зворотний зв'язок" +msgstr "Вимкнути тактильний зворотний зв'язок<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3053,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3123,7 +2926,7 @@ msgstr "Відкрити для себе нові стрічки" msgid "Dismiss" msgstr "Відхилити" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Пропустити помилку" @@ -3211,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3263,9 +3063,8 @@ msgstr "Завантажити Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Завантажити CAR файл" +msgstr "Завантажити CAR файл<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3284,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3351,7 +3148,7 @@ msgid "Edit" msgstr "Редагувати" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Редагувати фото профілю" @@ -3626,7 +3423,7 @@ msgstr "" msgid "Entertainment" msgstr "" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Помилка" @@ -3647,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Сталася помилка під час збереження" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Помилка отримання відповіді Captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "" @@ -3673,19 +3470,8 @@ msgstr "Будь-хто" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Спам; надмірні згадки або відповіді" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Надмірні або небажані повідомлення" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Окрім користувачів, на яких ви підписані" @@ -4017,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Стрічка" @@ -4164,26 +3946,8 @@ msgstr "Завершити" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Фітнес" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "" +msgstr "Фітнес<<<<<<< HEAD=======" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Гнучкий" @@ -4194,16 +3958,7 @@ msgstr "Гнучкий" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Підписатися" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Підписатися" @@ -4246,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Підписатися навзаєм" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Підписатися навзаєм" @@ -4295,13 +4042,9 @@ msgstr "Читачі, яких читаєте ви" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Читаю" @@ -4309,16 +4052,11 @@ msgstr "Читаю" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Читаю" +msgstr "Читаю<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Читають {0}" @@ -4405,15 +4143,8 @@ msgstr "Забули пароль?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Часто публікує неприйнятний контент" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4514,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Створити обличчя для вашого облікового запису" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Грубі порушення закону чи умов використання" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Створити обличчя для вашого облікового запису<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4674,21 +4395,7 @@ msgstr "Тактильний відгук" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Домагання, тролінг або нетерпимість" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4717,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Виникли проблеми?" +msgstr "Виникли проблеми?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4784,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Приховати пост від мене" @@ -4984,17 +4677,9 @@ msgstr "" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Якщо намагаєтесь змінити псевдонім або адресу електронної пошти, зробіть це до деактивації облікового запису." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Незаконний та невідкладний" +msgstr "Якщо намагаєтесь змінити псевдонім або адресу електронної пошти, зробіть це до деактивації облікового запису.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Зображення" @@ -5014,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Видавання себе за іншу особу або неправдиві твердження про особу чи приналежність" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Привласнення особистості іншої особи, введення в оману або хибні твердження" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5064,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Непристойні повідомлення або посилання з відвертим вмістом" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5100,21 +4764,13 @@ msgstr "Введіть пароль для видалення обліковог #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Введіть код, надісланий вам на електронну пошту" +msgstr "Введіть код, надісланий вам на електронну пошту<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Взаємодія обмежена" @@ -5188,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Зараз ви на самоті. Додайте користувачів до власної підбірки шукаючи їх вище." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "Вакансія: {0}" @@ -5231,17 +4887,13 @@ msgstr "{0} додав мітки." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Автор додав мітки." +msgstr "Автор додав мітки.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Мітки" @@ -5306,17 +4958,9 @@ msgstr "Дізнатися більше" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Дізнатись більше про Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "" @@ -5351,15 +4995,10 @@ msgstr "Дізнатися більше про те, що є публічним #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Дізнатися більше." @@ -5423,11 +5062,7 @@ msgid "Like" msgstr "Вподобати" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -5490,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Уподобання цього посту" @@ -5800,44 +5431,23 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Повідомлення" +msgstr "Повідомлення<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" ->>>>>>> upstream/main msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Оманливий обліковий запис" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Оманливий пост" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5898,15 +5508,10 @@ msgstr "Інструменти модерації" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Модератор вирішив встановити загальне попередження на вміст." +msgstr "Модератор вирішив встановити загальне попередження на вміст.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Більше стрічок" @@ -6047,18 +5652,8 @@ msgstr "Мої стрічки" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ім'я" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Ім'я чи Опис порушують стандарти спільноти" +msgstr "Ім'я<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6262,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ще немає вподобань" +msgstr "Ще немає вподобань<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Ви більше не читаєте {0}" @@ -6283,7 +5873,7 @@ msgstr "Ще немає повідомлень" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Ще ніяких сповіщень!" @@ -6337,9 +5927,9 @@ msgstr "Нічого не знайдено" msgid "No results found for \"{query}\"" msgstr "Нічого не знайдено за запитом «{query}»" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Нічого не знайдено за запитом «{query}»" @@ -6474,15 +6064,8 @@ msgstr "Щойно" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Оголеність" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Нагота чи матеріали для дорослих не позначені відповідним чином" +msgstr "Оголеність<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6503,11 +6086,7 @@ msgid "OK" msgstr "" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "Добре" @@ -6608,7 +6187,7 @@ msgid "Open drawer menu" msgstr "" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Емоджі" @@ -6708,7 +6287,7 @@ msgstr "Відкриє редактор" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "" @@ -6748,15 +6327,10 @@ msgstr "Відкриває форму скидання пароля" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Відкриває цей профіль" @@ -6790,12 +6364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Інше" @@ -6905,23 +6474,16 @@ msgstr "Люди, які читають @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7178,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Запостити" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Запостити" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Опублікувати все" @@ -7206,19 +6768,12 @@ msgstr "Пост видалено" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Не вдалось завантажити пост. Будь ласка, перевірте з'єднання з інтернетом та спробуйте ще раз." +msgstr "Не вдалось завантажити пост. Будь ласка, перевірте з'єднання з інтернетом та спробуйте ще раз.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "" @@ -7354,7 +6909,7 @@ msgstr "Політика конфіденційності" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Обробка відео..." @@ -7382,19 +6937,12 @@ msgstr "Профіль оновлено" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Публічний" @@ -7408,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "" @@ -7486,13 +7034,9 @@ msgstr "Цитування постів вимкнено" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Цитування" +msgstr "Цитування<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Цитування цього поста" @@ -7553,12 +7097,12 @@ msgstr "Читати Умови використання Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7649,8 +7193,8 @@ msgstr "Видалити вкладення" msgid "Remove Avatar" msgstr "Видалити аватар" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Видалити банер" @@ -7824,17 +7368,13 @@ msgstr "Відповіді вимкнуто" msgid "Replies to this post are disabled." msgstr "Відповіді в цьому пості вимкнено." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Відповісти" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "" @@ -7995,13 +7535,9 @@ msgstr "Ви зробили репост" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Репости цього поста" @@ -8074,17 +7610,13 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Скинути пароль" +msgstr "Скинути пароль<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "" @@ -8242,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Наука" +msgstr "Наука<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8299,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Шукати \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Пошук \"{searchText}\"" @@ -8328,7 +7857,7 @@ msgid "Search GIFs" msgstr "Пошук GIF-файлів" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8628,19 +8157,12 @@ msgstr "Додати дату народження" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Встановити новий пароль" +msgstr "Встановити новий пароль<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Налаштуйте ваш обліковий запис" @@ -8792,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8882,15 +8400,10 @@ msgstr "Показувати відповіді" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Показувати відповіді усім" @@ -8910,13 +8423,9 @@ msgstr "Показати попередження" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Показати попередження і фільтрувати зі стрічки" +msgstr "Показати попередження і фільтрувати зі стрічки<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "" @@ -8937,7 +8446,7 @@ msgstr "" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9144,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Спам" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Спам; надмірні згадки або відповіді" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9316,23 +8813,9 @@ msgstr "Пропоновано для вас" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Непристойний" +msgstr "Непристойний<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9450,18 +8933,8 @@ msgstr "Умови" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Умови Використання" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Використані терміни порушують стандарти спільноти" - -======= ->>>>>>> upstream/main +msgstr "Умови Використання<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Текст та мітки" @@ -9510,11 +8983,7 @@ msgid "That's everything!" msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Обліковий запис зможе взаємодіяти з вами після розблокування." @@ -9646,17 +9115,12 @@ msgstr "При з'єднанні з сервером виникла пробле msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Виникла проблема зі з'єднанням з сервером. Перевірте підключення до Інтернету і повторіть спробу знову." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Виникла проблема з завантаженням сповіщень. Натисніть тут, щоб повторити спробу." +msgstr "Виникла проблема з завантаженням сповіщень. Натисніть тут, щоб повторити спробу.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Виникла проблема з завантаженням постів. Натисніть тут, щоб повторити спробу." @@ -9695,16 +9159,9 @@ msgstr "Виникла проблема з оновленням ваших ст #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9732,19 +9189,14 @@ msgstr "У застосунку сталася неочікувана пробл #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Відбувався наплив нових користувачів у Bluesky! Ми активуємо ваш обліковий запис як тільки зможемо." +msgstr "Відбувався наплив нових користувачів у Bluesky! Ми активуємо ваш обліковий запис як тільки зможемо.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9897,13 +9349,9 @@ msgstr "" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Даний сервіс модерації недоступний. Перегляньте деталі нижче. Якщо проблема не зникне, зв'яжіться з нами." +msgstr "Даний сервіс модерації недоступний. Перегляньте деталі нижче. Якщо проблема не зникне, зв'яжіться з нами.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Зазначається, що пост було створено — <0>{0}, але вперше цей пост було оприлюднено на Bluesky — <1>{1}." @@ -10071,17 +9519,10 @@ msgstr "" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Перекласти" @@ -10203,22 +9644,13 @@ msgstr "Розблокувати" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Розблокувати обліковий запис" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Розблокувати обліковий запис?" @@ -10240,16 +9672,8 @@ msgstr "Скасувати репост" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Відписатись" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Відписатися від {0}" @@ -10281,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Прибрати вподобання" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "" @@ -10407,16 +9823,8 @@ msgstr "Відписано від списку" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Небажаний сексуальний вміст" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10466,20 +9874,20 @@ msgstr "Завантажити текстовий файл до:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Завантажити з камери" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Завантажити з файлів" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Завантажити з бібліотеки" @@ -10492,7 +9900,7 @@ msgstr "Завантаження зображень..." msgid "Uploading link thumbnail..." msgstr "Завантаження ескізу посилання..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Завантаження відео..." @@ -10746,7 +10154,7 @@ msgstr "Відео не знайдено." msgid "Video settings" msgstr "Налаштування відео" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Відео завантажено" @@ -10771,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Переглянути аватар {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10797,15 +10209,10 @@ msgstr "Докладніше у публікації в блозі" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Переглянути запис для налагодження" +msgstr "Переглянути запис для налагодження<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Переглянути деталі" @@ -10841,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Переглянути профіль" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Переглянути аватар" @@ -10888,15 +10291,10 @@ msgstr "Переглянути ігноровані облікові запис #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "" @@ -10910,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11068,7 +10463,7 @@ msgstr "Дуже прикро, але нам не вдалося знайти ц msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "На жаль, ми не змогли зараз завантажити ваші ігноровані слова. Будь ласка, спробуйте ще раз." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Даруйте, нам не вдалося виконати пошук за вашим запитом. Будь ласка, спробуйте ще раз через кілька хвилин." @@ -11196,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Чому слід переглянути цього користувача?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/vi/messages.po b/src/locale/locales/vi/messages.po index dfc862d00..9eff40c74 100644 --- a/src/locale/locales/vi/messages.po +++ b/src/locale/locales/vi/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, other {người theo dõi}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, other {đang theo dõi}}" +msgstr "{0, plural, other {đang theo dõi}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, other {lượt thích}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {bài đăng}}" +msgstr "{0, plural, other {bài đăng}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, other {trích dẫn}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, other {lượt đăng lại}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, other {trích dẫn}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, other {lượt đăng lại}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "" @@ -520,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} lúc {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "" @@ -611,30 +595,19 @@ msgstr "Trợ năng" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Cài đặt trợ năng" +msgstr "Cài đặt trợ năng<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Tài khoản" +msgstr "Tài khoản<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "Tài khoản đã bị chặn" @@ -661,26 +634,18 @@ msgstr "Tài khoản đã bị ẩn bởi Danh sách" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Tùy chọn tài khoản" +msgstr "Tùy chọn tài khoản<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "Tài khoản đã bị xóa khỏi truy cập nhanh" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "Tài khoản đã được bỏ chặn" @@ -770,7 +735,7 @@ msgstr "Thêm tài khoản khác" msgid "Add another post" msgstr "Thêm bài" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "" @@ -886,11 +851,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "Nội dung 18+" @@ -1116,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "Một hình vẽ cho thấy Bluesky chọn người xác minh đáng tin cậy, và rồi những người xác minh đáng tin cậy này xác minh từng tài khoản cá nhân khác." #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "Vấn đề không nằm trong các tùy chọn này" @@ -1177,21 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Giới thiệu xác minh trên Bluesky" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "Hành vi phản xã hội" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "Giới thiệu xác minh trên Bluesky<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1242,15 +1189,10 @@ msgstr "Mật khẩu ứng dụng phải dài tối thiểu 4 ký tự" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Mật khẩu ứng dụng" +msgstr "Mật khẩu ứng dụng<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "Mật khẩu ứng dụng" @@ -1283,19 +1225,12 @@ msgstr "Khiếu nại việc đình chỉ" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Kháng nghị quyết định này" +msgstr "Kháng nghị quyết định này<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "Giao diện" @@ -1307,23 +1242,14 @@ msgstr "Áp dụng bảng tin được đề xuất mặc định" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "Lưu trữ từ {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "Lưu trữ từ {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "Bài đăng lưu trữ" @@ -1392,18 +1318,11 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "Aurora" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1417,13 +1336,8 @@ msgstr "" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1432,7 +1346,7 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1497,9 +1411,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Ngày sinh" +msgstr "Ngày sinh<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1507,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "Chặn" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "Chặn tài khoản" @@ -1547,15 +1446,8 @@ msgstr "Chặn tài khoản" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Chặn và xoá" +msgstr "Chặn và xoá<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "Chặn và/hoặc xoá cuộc trò chuyện này" - -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "Danh sách chặn" @@ -1575,18 +1467,14 @@ msgstr "Chặn người dùng" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Chặn người dùng" +msgstr "Chặn người dùng<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "Đã bị chặn" @@ -1618,40 +1506,18 @@ msgstr "Việc chặn là công khai. Tài khoản bị chặng không thể tr #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "Việc chặn không ngăn nhãn gắn trên tài khoản của bạn, nhưng sẽ ngăn tài khoản này trả lời trong bài đăng của bạn hoặc tương tác với bạn." - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky không thể xác nhận tính xác thực của ngày được tuyên bố." - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "Blog" +msgstr "Việc chặn không ngăn nhãn gắn trên tài khoản của bạn, nhưng sẽ ngăn tài khoản này trả lời trong bài đăng của bạn hoặc tương tác với bạn.<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky không thể xác nhận tính xác thực của ngày được tuyên bố." -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky là mạng mở nơi bạn có thể chọn nhà cung cấp dịch vụ lưu trữ của mình. Nếu bạn là nhà phát triển, bạn có thể tự lưu trữ máy chủ của mình." @@ -1703,13 +1569,9 @@ msgstr "Sách" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/FeedInterstitials.tsx:442 -======= -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "Xem nhiều tài khoản hơn trên trang Khám phá" @@ -1820,19 +1682,13 @@ msgstr "Máy ảnh" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1860,17 +1716,11 @@ msgstr "Hủy kích hoạt lại và đăng xuất" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Huỷ tìm kiếm" +msgstr "Huỷ tìm kiếm<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "Không thể tương tác với người dùng đã bị chặn" @@ -1983,11 +1833,7 @@ msgid "Chat requests" msgstr "Yêu cầu trò chuyện" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2150,19 +1996,11 @@ msgstr "Lộp 🐴 cộp 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2232,7 +2070,7 @@ msgstr "" msgid "Closes password update alert" msgstr "Đóng cảnh báo cập nhật mật khẩu" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "Đóng trình soạn bài đăng và huỷ bỏ nháp" @@ -2304,7 +2142,7 @@ msgstr "Soạn bài đăng với độ dài tối đa {0, plural, other {# kí t msgid "Compose reply" msgstr "Soạn trả lời" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "Đang nén video..." @@ -2534,17 +2372,11 @@ msgstr "Sao chép mã DID của tác giả" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Sao chép mã" +msgstr "Sao chép mã<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "Sao chép DID" @@ -2706,7 +2538,7 @@ msgstr "Tạo tài khoản" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "Tạo tài khoản" @@ -2767,15 +2599,8 @@ msgstr "Tùy chỉnh" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Tùy chọn tùy chỉnh" +msgstr "Tùy chọn tùy chỉnh<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "Tùy chỉnh ai có thể tương tác với bài đăng này." - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "Tuỳ biến trải nghiệm Bluesky của bạn" @@ -2786,19 +2611,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "Tối" @@ -2835,17 +2653,13 @@ msgstr "Bảng gỡ lỗi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "Mặc định" @@ -2854,17 +2668,10 @@ msgid "Default icons" msgstr "Biểu tượng mặc định" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3027,20 +2834,26 @@ msgstr "Tắt Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Tắt phản hồi xúc giác" +msgstr "Tắt phản hồi xúc giác<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3054,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3124,7 +2926,7 @@ msgstr "Khám phá bảng tin mới" msgid "Dismiss" msgstr "Bỏ qua" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "Bỏ qua lỗi " @@ -3212,11 +3014,8 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3264,9 +3063,8 @@ msgstr "Tải Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Tải tệp CAR" +msgstr "Tải tệp CAR<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3285,10 +3083,8 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" msgstr "" @@ -3352,7 +3148,7 @@ msgid "Edit" msgstr "Chỉnh sửa" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "Chỉnh sửa hình đại diện" @@ -3627,7 +3423,7 @@ msgstr "Mở toàn màn hình" msgid "Entertainment" msgstr "Giải trí" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "Lỗi" @@ -3648,11 +3444,11 @@ msgstr "" msgid "Error occurred while saving file" msgstr "Đã có lỗi xảy ra khi đang lưu tệp" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "Nhận được lỗi phản hồi captcha." -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "Lỗi: {error}" @@ -3674,19 +3470,8 @@ msgstr "Tất cả mọi người" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "Quá nhiều đề cập hoặc trả lời" +msgstr "<<<<<<< HEAD" -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "Quá nhiều hoặc tin nhắn không mong muốn" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "Trừ người dùng bạn đang theo dõi" @@ -4018,13 +3803,9 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:292 -======= -#: src/Navigation.tsx:291 ->>>>>>> upstream/main msgid "Feed" msgstr "Bảng tin" @@ -4165,26 +3946,8 @@ msgstr "Hoàn tất" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Thể hình" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "Thuần đen" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "Thuần xanh" +msgstr "Thể hình<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "Thuần trắng" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "Linh hoạt" @@ -4195,16 +3958,7 @@ msgstr "Linh hoạt" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "Theo dõi" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "Theo dõi" @@ -4247,16 +4001,8 @@ msgstr "" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "Theo dõi lại" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "Theo dõi lại" @@ -4296,13 +4042,9 @@ msgstr "Người theo dõi bạn biết" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "Đang theo dõi" @@ -4310,16 +4052,11 @@ msgstr "Đang theo dõi" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Đang theo dõi" +msgstr "Đang theo dõi<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "Đang theo dõi {0}" @@ -4406,15 +4143,8 @@ msgstr "Quên?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "Bài đăng thường xuyên Nội dung không mong muốn" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "" @@ -4515,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Chọn hình cho hồ sơ của bạn" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "Vi phạm rõ ràng luật pháp hoặc điều khoản dịch vụ" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "" ->>>>>>> upstream/main +msgstr "Chọn hình cho hồ sơ của bạn<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4675,21 +4395,7 @@ msgstr "Xúc giác" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "Quấy rối, gây rối hoặc phân biệt đối xử" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "" ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4718,15 +4424,10 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Gặp trục trặc?" +msgstr "Gặp trục trặc?<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4785,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ẩn tùy chọn trùy chỉnh" +msgstr "Ẩn tùy chọn trùy chỉnh<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "Ẩn bài đăng cho tôi" @@ -4985,17 +4677,9 @@ msgstr "Nếu bạn là một lập trình viên, bạn có thể tự quản l #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "Nếu bạn muốn thay đổi tên người dùng hoặc email, hãy thực hiện trước khi vô hiệu hóa." - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "Phạm pháp và Khẩn cấp" +msgstr "Nếu bạn muốn thay đổi tên người dùng hoặc email, hãy thực hiện trước khi vô hiệu hóa.<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "Ảnh" @@ -5015,29 +4699,15 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "Mạo danh hoặc tuyên bố sai danh tính hoặc liên kết" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "Mạo danh, sai thông tin, hoặc tuyên bố sai" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5065,15 +4735,8 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "Tin nhắn không phù hợp hoặc liên kết nhạy cảm" +msgstr "<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5101,21 +4764,13 @@ msgstr "Nhập mật khẩu cho việc xóa tài khoản" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Nhập mã đã được gởi đến email của bạn" +msgstr "Nhập mã đã được gởi đến email của bạn<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "Tương tác bị giới hạn" @@ -5189,7 +4844,7 @@ msgstr "" msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "Chỉ mới có bạn thôi! Thêm người khác vào gói khởi đầu của bạn bằng cách tìm kiếm ở trên." -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "ID công việc: {0}" @@ -5232,17 +4887,13 @@ msgstr "Gắn nhãn bởi {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Gắn nhãn bởi người đăng." +msgstr "Gắn nhãn bởi người đăng.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "Nhãn" @@ -5307,17 +4958,9 @@ msgstr "Tìm hiểu thêm" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "Tìm hiểu thêm về Bluesky" +msgstr "<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "Tìm hiểu thêm về việc tự lưu trữ PDS của bạn." @@ -5352,15 +4995,10 @@ msgstr "Tìm hiểu thêm về những gì công khai trên Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "Tìm hiểu thêm." @@ -5424,11 +5062,7 @@ msgid "Like" msgstr "Thích" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "Thích ({0, plural, other {# lượt thích}})" @@ -5491,13 +5125,9 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "Lượt thích cho bài đăng này" @@ -5801,45 +5431,23 @@ msgstr "Tuỳ chọn tin nhắn" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Tin nhắn" +msgstr "Tin nhắn<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "Nửa đêm" ->>>>>>> upstream/main +msgstr "=======" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:509 -======= -#: src/Navigation.tsx:500 ->>>>>>> upstream/main msgid "Miscellaneous notifications" msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "Tài khoản sai lệch" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "Bài đăng sai lệch" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5900,15 +5508,10 @@ msgstr "Công cụ kiểm duyệt" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "Kiểm duyệt viên đã đặt cảnh báo chung cho nội dung." +msgstr "Kiểm duyệt viên đã đặt cảnh báo chung cho nội dung.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "Bảng tin khác" @@ -6049,18 +5652,8 @@ msgstr "Bảng tin của tôi" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Tên" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "Tên hoặc mô tả phi phạm tiêu chuẩn cộng đồng" - -======= ->>>>>>> upstream/main +msgstr "Tên<<<<<<< HEAD" + #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6264,16 +5857,11 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Chưa có lượt thích nào" +msgstr "Chưa có lượt thích nào<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "Không còn theo dõi {0}" @@ -6285,7 +5873,7 @@ msgstr "Chưa có tin nhắn nào" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "Chưa có thông báo nào!" @@ -6339,9 +5927,9 @@ msgstr "Không tìm thấy kết quả nào" msgid "No results found for \"{query}\"" msgstr "Không tìm thấy kết quả nào cho \"{query}\"" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "Không tìm thấy kết quả nào cho {query}" @@ -6476,15 +6064,8 @@ msgstr "Bây giờ" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Khỏa thân" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "Hình khỏa thân hoặc nội dung 18+ không được gắn nhãn đúng" +msgstr "Khỏa thân<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6505,11 +6086,7 @@ msgid "OK" msgstr "OK" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "OK" @@ -6610,7 +6187,7 @@ msgid "Open drawer menu" msgstr "Mở trình đơn" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "Mở trình chọn biểu tượng cảm xúc" @@ -6710,7 +6287,7 @@ msgstr "Mở trình soạn thảo" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "Mở trình chọn emoji" @@ -6750,15 +6327,10 @@ msgstr "Mở biểu mẫu đặt lại mật khẩu" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "Mở hồ sơ này" @@ -6792,12 +6364,7 @@ msgstr "Trạng thái OTA: Không có cập nhật" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "Khác" @@ -6907,23 +6474,16 @@ msgstr "Người đang theo dõi @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "" @@ -7180,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "Đăng" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "Đăng" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "Đăng tất cả" @@ -7208,19 +6768,12 @@ msgstr "Đã xóa bài đăng" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Không đăng bài đăng được. Vui lòng kiểm tra kết nối mạng và thử lại." +msgstr "Không đăng bài đăng được. Vui lòng kiểm tra kết nối mạng và thử lại.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "Bài đăng đã bị xoá" @@ -7356,7 +6909,7 @@ msgstr "Chính sách bảo mật" msgid "Privacy violation of a minor" msgstr "" -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "Đang xử lý video..." @@ -7384,19 +6937,12 @@ msgstr "Đã cập nhật hồ sơ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "" +msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:155 -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 ->>>>>>> upstream/main msgid "Psst! You can edit who can interact with this post." -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" msgstr "Công khai" @@ -7410,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "Danh sách công khai và chia sẻ được có thể thúc đẩy bảng tin." #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "Đăng bài" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "Đăng bài" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "Đăng trả lời" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "Đăng trả lời" @@ -7488,13 +7034,9 @@ msgstr "Trích dẫn bài đăng đã bị tắt" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Trích dẫn" +msgstr "Trích dẫn<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "Trích dẫn của bài đăng này" @@ -7555,12 +7097,12 @@ msgstr "Đọc Điều khoản dịch vụ của Bluesky" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7651,8 +7193,8 @@ msgstr "Xóa tệp đính kèm" msgid "Remove Avatar" msgstr "Xóa hình đại diện" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "Xóa hình bìa" @@ -7826,17 +7368,13 @@ msgstr "Trả lời đã bị tắt" msgid "Replies to this post are disabled." msgstr "Trả lời cho bài đăng này đã bị tắt." -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "Trả lời" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "Trả lời ({0, plural, other {# trả lời}})" @@ -7997,13 +7535,9 @@ msgstr "Đăng lại bởi bạn" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "Lượt đăng lại của bài đăng này" @@ -8076,17 +7610,13 @@ msgstr "Đặt lại trại thái hướng dẫn" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Đặt lại mật khẩu" +msgstr "Đặt lại mật khẩu<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "Thử đăng nhập lại" @@ -8244,19 +7774,16 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Khoa học" +msgstr "Khoa học<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "" @@ -8301,11 +7828,11 @@ msgstr "" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "Tìm kiếm \"{query}\"" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "Tìm kiếm \"{searchText}\"" @@ -8330,7 +7857,7 @@ msgid "Search GIFs" msgstr "Tìm GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "" @@ -8630,19 +8157,12 @@ msgstr "Đặt ngày sinh" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Đặt mất khẩu mới" +msgstr "Đặt mất khẩu mới<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "Thiết lập tài khoản của bạn" @@ -8794,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -8884,15 +8400,10 @@ msgstr "Hiển thị trả lời" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Hiển thị trả lời dưới dạng" +msgstr "Hiển thị trả lời dưới dạng<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "Hiển thị trả lời cho tất cả mọi người" @@ -8912,13 +8423,9 @@ msgstr "Hiển thị cảnh báo" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Hiển thị cảnh báo và bộ lọc từ bảng tin" +msgstr "Hiển thị cảnh báo và bộ lọc từ bảng tin<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "Hiển thị thông tin về thời gian đăng của bài này" @@ -8939,7 +8446,7 @@ msgstr "Hiển thị nội dung" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9146,24 +8653,12 @@ msgid "Source: <0>{sourceName}" msgstr "Nguồn: <0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "" -<<<<<<< HEAD - -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "Spam; tag người hoặc trả lời liên tục" -======= ->>>>>>> upstream/main +msgstr "<<<<<<< HEAD" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -9318,23 +8813,9 @@ msgstr "Được đề xuất dành cho bạn" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Đề xuất" +msgstr "Đề xuất<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "Bình minh" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "Hoàng hôn" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9452,18 +8933,8 @@ msgstr "Điều khoản" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Điều khoản dịch vụ" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "Điều khoản sử dụng vi phạm tiêu chuẩn cộng đồng" - -======= ->>>>>>> upstream/main +msgstr "Điều khoản dịch vụ<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "Văn bản & thẻ" @@ -9512,11 +8983,7 @@ msgid "That's everything!" msgstr "Hết bảng tin video!" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "Tài khoản có thể tương tác với bạn sau khi bỏ chặn." @@ -9648,17 +9115,12 @@ msgstr "Có vấn đề khi kết nối với máy chủ" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "Có vấn đề khi kết nối với máy chủ, vui lòng kiểm tra kết nối mạng của bạn và thử lại." -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Có vấn đề khi tải thông báo. Nhấn vào đây để thử lại." +msgstr "Có vấn đề khi tải thông báo. Nhấn vào đây để thử lại.<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "Có vấn đề khi tải bài đăng. Nhấn vào đây để thử lại." @@ -9697,16 +9159,9 @@ msgstr "Có vấn đề cập nhật bảng tin của bạn, vui lòng kiểm tr #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9734,19 +9189,14 @@ msgstr "Đã xảy ra một vấn đề không mong muốn trong ứng dụng. V #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Có một lượng lớn người dùng mới đến Bluesky! Chúng tôi sẽ kích hoạt tài khoản của bạn ngay khi có thể." +msgstr "Có một lượng lớn người dùng mới đến Bluesky! Chúng tôi sẽ kích hoạt tài khoản của bạn ngay khi có thể.<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -9899,13 +9349,9 @@ msgstr "Danh sách này đang trống." #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "Dịch vụ kiểm duyệt này không khả dụng. Xem bên dưới để biết thêm chi tiết. Nếu vấn đề này vẫn tiếp tục, hãy liên hệ với chúng tôi." +msgstr "Dịch vụ kiểm duyệt này không khả dụng. Xem bên dưới để biết thêm chi tiết. Nếu vấn đề này vẫn tiếp tục, hãy liên hệ với chúng tôi.<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "Bài đăng này khai rằng đã được tạo vào <0>{0}, nhưng lần đầu tiên được Bluesky nhìn thấy vào <1>{1}." @@ -10073,17 +9519,10 @@ msgstr "Chủ đề" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "Dịch" @@ -10205,22 +9644,13 @@ msgstr "Bỏ chặn" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "Bỏ chặn tài khoản" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "Bỏ chặn tài khoản" @@ -10242,16 +9672,8 @@ msgstr "Bỏ chặn bài đăng lại" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "Huỷ đăng lại ({0, plural, other {# đăng lại}})" +msgstr "Huỷ đăng lại ({0, plural, other {# đăng lại}})<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "Bỏ theo dõi" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "Bỏ theo dõi {0}" @@ -10283,22 +9705,14 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "Bỏ thích" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "Bỏ thích ({0, plural, other {# lượt thích}})" @@ -10409,16 +9823,8 @@ msgstr "Đã bỏ đăng ký danh sách" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "Nội dung khiêu dâm không mong muốn" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10468,20 +9874,20 @@ msgstr "Tải lên tệp văn bản đến:" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "Tải lên từ máy ảnh" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "Tải lên từ Files" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "Tải lên từ Thư viện" @@ -10494,7 +9900,7 @@ msgstr "Đang tải lên hình..." msgid "Uploading link thumbnail..." msgstr "Đang tải lên hình cho liên kết..." -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "Đang tải lên video..." @@ -10748,7 +10154,7 @@ msgstr "Không tìm thấy video." msgid "Video settings" msgstr "Cài đặt video" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "Đã tải lên video" @@ -10773,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "Xem hình đại diện của {0}" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10799,15 +10209,10 @@ msgstr "Xem bài đăng để biết thêm chi tiết" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Xem bản ghi gỡ lỗi" +msgstr "Xem bản ghi gỡ lỗi<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "Xem chi tiết" @@ -10843,10 +10248,6 @@ msgstr "" msgid "View profile" msgstr "Xem hồ sơ" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "Xem hình đại diện" @@ -10890,15 +10291,10 @@ msgstr "Xem tài khoản bạn đã ẩn" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Xem xác minh của bạn" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "Xem xác minh của bạn<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "Xem hình đầy đủ" @@ -10912,15 +10308,12 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11070,7 +10463,7 @@ msgstr "Xin lỗi, chúng tôi không thể xử lý danh sách này. Nếu vẫ msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "Xin lỗi, chung tối không thể tải từ cấm của bạn vào lúc này. Vui lòng thử lại." -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "Xin lỗi, chúng tôi không thể hoàn thành tìm kiếm của bạn. Vui lòng thử lại sau vài phút." @@ -11198,11 +10591,7 @@ msgid "Why should this user be reviewed?" msgstr "Tại sao người dùng này cần được xem xét?" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -======= msgid "Would you like to block this user and/or delete this conversation?" ->>>>>>> upstream/main msgstr "" #: src/screens/Messages/components/MessageInput.tsx:154 diff --git a/src/locale/locales/zh-CN/messages.po b/src/locale/locales/zh-CN/messages.po index 772e6bde9..2e1249469 100644 --- a/src/locale/locales/zh-CN/messages.po +++ b/src/locale/locales/zh-CN/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {关注者} other {关注者}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {正在关注} other {正在关注}}" +msgstr "{0, plural, one {正在关注} other {正在关注}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {喜欢} other {喜欢}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {帖文} other {帖文}}" +msgstr "{0, plural, one {帖文} other {帖文}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {引用} other {引用}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {转发} other {转发}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {引用} other {引用}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {转发} other {转发}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {收藏} other {收藏}}" @@ -152,11 +136,7 @@ msgstr "{0, plural,other {+其他 # 个新手包}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0}（账户)" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "请<0>登录<1>或<2>创建账户<3><4>即可在 Bluesky 上搜索新闻、体育、政治等新鲜事。" @@ -587,11 +567,7 @@ msgstr "关于" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "粗暴对待或歧视行为" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "无障碍" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "无障碍设置" +msgstr "无障碍设置<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "账户" +msgstr "账户<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "已屏蔽该账户" @@ -669,26 +634,18 @@ msgstr "该账户已被列表隐藏" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "账户选项" +msgstr "账户选项<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "已从快速访问中移除该账户" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "已取消屏蔽该账户" @@ -778,7 +735,7 @@ msgstr "添加其他账户" msgid "Add another post" msgstr "添加另一则帖文" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "添加另一则帖文至帖文串" @@ -889,20 +846,12 @@ msgstr "色情" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人内容" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "成人内容" @@ -921,11 +870,7 @@ msgstr "成人内容标记" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人性虐待内容" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "这张图片显示 Bluesky 官方可挑选信任的认证人，并由可信认证人为其他账户授予认证。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "不在这些选项中的问题" @@ -1171,19 +1112,11 @@ msgstr "和" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "动物性虐待" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "动物福利" ->>>>>>> upstream/main +msgstr "动物福利>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "为你介绍 Bluesky 上的认证机制" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "反社会行为" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "为你介绍 Bluesky 上的认证机制<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "应用密码至少应含有 4 个字符" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "应用密码" +msgstr "应用密码<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "应用密码" @@ -1307,19 +1225,12 @@ msgstr "暂停申诉" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "对此决定提出申诉" +msgstr "对此决定提出申诉<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "外观" @@ -1331,23 +1242,14 @@ msgstr "使用默认推荐的动态源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "应用提交变更" +msgstr "应用提交变更<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "自 {0} 起被归档" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "自 {0} 起被归档" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "已归档帖文" @@ -1416,18 +1318,11 @@ msgstr "为算法指定主题" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少应含有 8 个字符" +msgstr "至少应含有 8 个字符<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "极光" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "可用" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "可用" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "返回私信" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "违法活动或违反安全规定的行为" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "被禁用户视图绕过封禁" ->>>>>>> upstream/main +msgstr "被禁用户视图绕过封禁>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "请填写以下栏位，以开始年龄验证流程。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日" +msgstr "生日<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "屏蔽" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "屏蔽账户" @@ -1579,15 +1446,8 @@ msgstr "屏蔽账户" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "屏蔽并删除" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "屏蔽并删除对话" +msgstr "屏蔽并删除<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "屏蔽列表" @@ -1607,18 +1467,14 @@ msgstr "屏蔽用户" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "屏蔽用户" +msgstr "屏蔽用户<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "屏蔽该用户或删除整个对话（多选）" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "已被屏蔽" @@ -1650,40 +1506,18 @@ msgstr "屏蔽是公开可见的。被屏蔽的账户无法在你的帖文下回 #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "屏蔽不会阻止其继续标记你的账户，但会阻止该账户在你发布的帖文下回复或与你互动。" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky 无法确认帖文发布时间的真实性。" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "博客" +msgstr "屏蔽不会阻止其继续标记你的账户，但会阻止该账户在你发布的帖文下回复或与你互动。<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky 无法确认帖文发布时间的真实性。" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky 经典™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky 是一个开放的社交网络，你可以自行选择托管服务提供商。如果你是开发者，你还可以托管自己的服务器。" @@ -1735,15 +1569,9 @@ msgstr "书籍" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "违反站点规则" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "在探索页面浏览更多账户" @@ -1854,19 +1682,13 @@ msgstr "相机" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "取消重新启用账户并登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "取消搜索" +msgstr "取消搜索<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "无法与被屏蔽的用户进行互动" @@ -1955,11 +1771,7 @@ msgstr "更改密码对话框" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "更改举报类型" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "私信请求" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "请在下方输入发送到你电子邮箱的验证码：" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "儿童安全" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "儿童性虐待内容（CSAM）" ->>>>>>> upstream/main +msgstr "儿童性虐待内容（CSAM）>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "哒哒🐴哒哒🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "关闭欢迎界面" msgid "Closes password update alert" msgstr "关闭密码更新警告" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "关闭编辑器并舍弃草稿" @@ -2350,7 +2142,7 @@ msgstr "撰写最多 {0, plural,other {# 个字符}} 的帖文" msgid "Compose reply" msgstr "撰写回复" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "正在压缩视频……" @@ -2472,11 +2264,7 @@ msgstr "内容不可用" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "宣扬或提倡自残内容" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "复制发布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "复制代码" +msgstr "复制代码<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "复制 DID" @@ -2756,7 +2538,7 @@ msgstr "创建账户" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "创建一个账户" @@ -2817,35 +2599,16 @@ msgstr "自定义" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自定义选项" +msgstr "自定义选项<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "自定义哪些人可以参与这则帖文的互动。" - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "自定义你的 Bluesky 体验" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "危险挑战或活动" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "危险物质或药物滥用" @@ -2854,7 +2617,6 @@ msgstr "危险物质或药物滥用" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "深色" @@ -2891,19 +2653,13 @@ msgstr "调试面板" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "深度伪造成人内容" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "默认" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "默认图标" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "停用电子邮箱两步验证" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "停用触觉反馈" +msgstr "停用触觉反馈<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3182,7 +2926,7 @@ msgstr "探索新的动态源" msgid "Dismiss" msgstr "跳过" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "忽略错误" @@ -3270,11 +3014,8 @@ msgstr "别担心！你现有的对话及设置都已保存，只需验证你已 #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3322,9 +3063,8 @@ msgstr "下载 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下载 CAR 文件" +msgstr "下载 CAR 文件<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3347,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "人肉搜索" ->>>>>>> upstream/main +msgstr "人肉搜索>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3396,11 +3131,7 @@ msgstr "例如：滥发广告内容的用户。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "进食障碍" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3417,7 +3148,7 @@ msgid "Edit" msgstr "编辑" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "编辑头像" @@ -3692,7 +3423,7 @@ msgstr "进入全屏模式" msgid "Entertainment" msgstr "娱乐" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "错误" @@ -3713,11 +3444,11 @@ msgstr "错误信息" msgid "Error occurred while saving file" msgstr "保存文件时发生错误" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "CAPTCHA（人机验证）响应错误。" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "错误：{error}" @@ -3739,19 +3470,8 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他内容" +msgstr "其他内容<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "过于频繁的提及或回复" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "过于频繁或不受欢迎的信息" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "排除你已关注的用户" @@ -3875,11 +3595,7 @@ msgstr "外部媒体偏好设置" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "极端主义内容" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4083,23 +3799,13 @@ msgstr "无法验证账户代码，请重试。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" msgstr "" -#: src/Navigation.tsx:292 -======= -msgstr "虚假账户或机器人" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "散布选举相关虚假信息" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "动态源" @@ -4240,26 +3946,8 @@ msgstr "完成" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "哑光黑" +msgstr "健康<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "哑光蓝" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "哑光白" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "灵活" @@ -4270,16 +3958,7 @@ msgstr "灵活" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "关注" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "关注" @@ -4322,16 +4001,8 @@ msgstr "关注所有账户" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "回关" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "回关" @@ -4371,13 +4042,9 @@ msgstr "你认识的关注者" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "正在关注" @@ -4385,16 +4052,11 @@ msgstr "正在关注" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "正在关注" +msgstr "正在关注<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "已关注 {0}" @@ -4481,15 +4143,8 @@ msgstr "忘记了？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "还你一个干净的时间线" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "频繁发布不受欢迎的内容" +msgstr "还你一个干净的时间线<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "发自" @@ -4590,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "为你的个人资料选择头像" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "明显违反法规或服务条款" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "颂扬暴力" ->>>>>>> upstream/main +msgstr "为你的个人资料选择头像<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4711,27 +4356,15 @@ msgstr "敏感/写实媒体" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" -msgstr "" -======= -msgstr "露骨暴力内容" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" msgstr "引诱拐骗行为" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "黑客入侵或系统攻击行为" ->>>>>>> upstream/main +msgstr "黑客入侵或系统攻击行为>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4762,24 +4395,8 @@ msgstr "触感" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "骚扰、恶作剧或歧视行为" -======= -msgstr "骚扰或仇恨行为" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "有害或高风险活动" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "伤害或危及未成年人安全" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4798,11 +4415,7 @@ msgstr "标签 {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "仇恨言论" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4811,15 +4424,10 @@ msgstr "拥有验证码？<0>点击这里。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到问题了？" +msgstr "遇到问题了？<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4878,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隐藏自定义选项" +msgstr "隐藏自定义选项<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "仅为我隐藏这则帖文" @@ -5014,11 +4613,7 @@ msgstr "我们应该如何开启这条链接？" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "人口贩卖" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5082,17 +4677,9 @@ msgstr "如果你是开发者，你可以自行托管服务器。" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "如果你想更改你的账户代码或电子邮箱，请记得在停用之前进行更改。" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "违法" +msgstr "如果你想更改你的账户代码或电子邮箱，请记得在停用之前进行更改。<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "图片" @@ -5112,29 +4699,15 @@ msgstr "已保存图片" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "无法保存图片，请允许应用访问照片图库。" +msgstr "无法保存图片，请允许应用访问照片图库。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "冒充、虚假声明身份或隶属关系" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "冒充、提供虚假信息或提出虚假声明" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "冒充身份" ->>>>>>> upstream/main +msgstr "冒充身份>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5162,15 +4735,8 @@ msgstr "应用内、系统推送、所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "应用内、系统推送、你关注的人" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "不当消息或敏感链接" +msgstr "应用内、系统推送、你关注的人<<<<<<< HEAD" -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5198,21 +4764,13 @@ msgstr "输入密码以删除账户" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "输入发送至你电子邮箱的验证码" +msgstr "输入发送至你电子邮箱的验证码<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "已限制互动" @@ -5286,7 +4844,7 @@ msgstr "现在新手包里只有<0>{0}！通过上面的搜索功能将更 msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "现在只有你一个！通过上面的列表将更多人添加到你的新手包里面。" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "作业 ID：{0}" @@ -5329,17 +4887,13 @@ msgstr "由 {0} 标记。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "由发布者标记。" +msgstr "由发布者标记。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "标记" @@ -5404,17 +4958,9 @@ msgstr "了解详情" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "深入了解年龄验证" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "深入了解有关 Bluesky 的信息" +msgstr "深入了解年龄验证<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "深入了解有关自行托管 PDS 的信息。" @@ -5449,15 +4995,10 @@ msgstr "深入了解有关 Bluesky 公开内容的信息。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "在你的<0>账户设置了解详情" +msgstr "在你的<0>账户设置了解详情<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "了解详情。" @@ -5521,11 +5062,7 @@ msgid "Like" msgstr "喜欢" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "喜欢（{0, plural, one {# 次喜欢} other {# 次喜欢}}）" @@ -5588,13 +5125,9 @@ msgstr "喜欢你转发的帖文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "喜欢你转发帖文的通知" +msgstr "喜欢你转发帖文的通知<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "这则帖文的喜欢数" @@ -5898,49 +5431,24 @@ msgstr "私信选项" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "私信" +msgstr "私信<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "午夜" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "轻度骚扰或霸凌行为" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "其他通知" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "误导性账户" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "误导性帖文" -======= -msgstr "误导" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6000,15 +5508,10 @@ msgstr "内容审核工具" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "内容审核服务提供方已对该内容标记一般警告。" +msgstr "内容审核服务提供方已对该内容标记一般警告。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "更多动态源" @@ -6149,18 +5652,8 @@ msgstr "我的动态源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名称" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "名称或描述违反了社群准则" +msgstr "名称<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6364,16 +5857,11 @@ msgstr "没有图片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "目前还没有喜欢" +msgstr "目前还没有喜欢<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "已不再关注 {0}" @@ -6385,7 +5873,7 @@ msgstr "目前还没有私信" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "告别那些充斥着垃圾信息的算法，找到对你有利而非有害的动态源。" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "目前还没有通知！" @@ -6439,9 +5927,9 @@ msgstr "找不到结果" msgid "No results found for \"{query}\"" msgstr "找不到符合“{query}”的结果" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "找不到符合 {query} 的结果" @@ -6481,11 +5969,7 @@ msgstr "找不到任何人，试试搜点其他关键字。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "非自愿的亲密视频" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6580,15 +6064,8 @@ msgstr "现在" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸露" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "未标记的裸露或成人内容" +msgstr "裸露<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6609,11 +6086,7 @@ msgid "OK" msgstr "好的" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "好的" @@ -6714,7 +6187,7 @@ msgid "Open drawer menu" msgstr "开启抽屉菜单" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "开启表情符号选择器" @@ -6814,7 +6287,7 @@ msgstr "开启编辑器" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "开启设备相册以选择最多 {MAX_IMAGES, plural, other {# 张图片}}、单段视频或一张 GIF。" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "开启表情符号选择器" @@ -6854,15 +6327,10 @@ msgstr "开启密码重置申请" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "开启帖文语言设置" +msgstr "开启帖文语言设置<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "开启该个人资料" @@ -6896,12 +6364,7 @@ msgstr "OTA 状态：无可用" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "其他" @@ -6911,35 +6374,8 @@ msgstr "其他账户" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "其他儿童安全问题" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "其他危险内容" @@ -6962,8 +6398,7 @@ msgstr "其他性虐待内容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力内容" ->>>>>>> upstream/main +msgstr "其他暴力内容>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7039,23 +6474,16 @@ msgstr "关注 @{0} 的用户" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我关注的人" +msgstr "我关注的人<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "已被拒绝访问照片图库，请在系统设置中授权。" @@ -7312,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "帖文" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "发布" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "全部发布" @@ -7340,19 +6768,12 @@ msgstr "已删除帖文" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "帖文发布失败。请检查网络连接并重试。" +msgstr "帖文发布失败。请检查网络连接并重试。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "帖文已被删除" @@ -7486,13 +6907,9 @@ msgstr "隐私政策" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "侵犯未成年隐私" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "正在处理视频……" @@ -7520,13 +6937,10 @@ msgstr "已更新个人资料" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD -======= -msgstr "宣传或销售违法物品或服务" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 @@ -7542,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "公开且可对外分享的列表，也可作为动态源来使用。" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "发布帖文" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "发布帖文" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "发布回复" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "发布回复" @@ -7620,13 +7034,9 @@ msgstr "已停用帖文引用" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用" +msgstr "引用<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "引用这则帖文" @@ -7687,12 +7097,12 @@ msgstr "浏览 Bluesky 服务条款" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7783,8 +7193,8 @@ msgstr "删除关联" msgid "Remove Avatar" msgstr "删除头像" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "删除横幅图片" @@ -7958,17 +7368,13 @@ msgstr "已停用回复" msgid "Replies to this post are disabled." msgstr "这则帖文的回复已被停用。" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "回复" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "回复（{0, plural, one {# 则回复} other {# 则回复}}）" @@ -8058,11 +7464,7 @@ msgstr "已提交举报" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "举报此对话" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8133,13 +7535,9 @@ msgstr "你已转发" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "转发" +msgstr "转发<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "转发这则帖文" @@ -8212,17 +7610,13 @@ msgstr "重置入门引导状态" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重置密码" +msgstr "重置密码<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "重试登录" @@ -8375,28 +7769,21 @@ msgstr "问声好！" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "诈骗" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科学" +msgstr "科学<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "向左旋转" @@ -8441,11 +7828,11 @@ msgstr "搜索“{interestsDisplayName}”" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "搜索“{interestsDisplayName}“（已选中）" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "搜索“{query}”" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "搜索“{searchText}”" @@ -8470,7 +7857,7 @@ msgid "Search GIFs" msgstr "搜索 GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "未登录状态无法使用搜索功能" @@ -8563,11 +7950,7 @@ msgstr "选择一个颜色" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "选择一个原因" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8704,11 +8087,7 @@ msgstr "不支持选择多种媒体类型。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "自我伤害或其他危险行为" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8778,19 +8157,12 @@ msgstr "设置出生日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "设置新密码" +msgstr "设置新密码<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "设置你的账户" @@ -8942,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9032,15 +8400,10 @@ msgstr "显示回复" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "将回复显示为" +msgstr "将回复显示为<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "公开显示回复" @@ -9060,13 +8423,9 @@ msgstr "显示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "显示警告并从动态源中过滤" +msgstr "显示警告并从动态源中过滤<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "显示这则帖文的创建时间" @@ -9087,7 +8446,7 @@ msgstr "显示内容" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9294,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "来源：<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "垃圾内容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "垃圾内容、过于频繁的提及或回复" -======= -msgstr "垃圾信息或其他虚假欺骗行为" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9467,23 +8813,9 @@ msgstr "为你推荐" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示" +msgstr "性暗示<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "日出" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "日落" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9555,11 +8887,7 @@ msgstr "点按以跳过" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "针对性骚扰" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9605,18 +8933,8 @@ msgstr "条款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服务条款" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "用词违反了社群准则" - -======= ->>>>>>> upstream/main +msgstr "服务条款<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "文本及标签" @@ -9665,11 +8983,7 @@ msgid "That's everything!" msgstr "就这些了！" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "取消屏蔽后，该账户将重新能够与你互动。" @@ -9801,17 +9115,12 @@ msgstr "连接服务器时出现问题" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "连接至服务器时出现问题。请检查网络连接并重试。" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "刷新通知时出现问题，点击重试。" +msgstr "刷新通知时出现问题，点击重试。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "刷新帖文时出现问题，点击重试。" @@ -9850,16 +9159,9 @@ msgstr "更新动态源时出现问题。请检查网络连接并重试。" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9887,19 +9189,14 @@ msgstr "应用发生意外错误，请联系我们进行错误反馈！" #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Bluesky 目前迎来了大量新用户！我们将尽快启用你的账户。" +msgstr "Bluesky 目前迎来了大量新用户！我们将尽快启用你的账户。<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10052,13 +9349,9 @@ msgstr "此列表为空。" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "该内容审核提供服务不可用，请查看下方获取更多详情。如果问题持续存在，请联系我们。" +msgstr "该内容审核提供服务不可用，请查看下方获取更多详情。如果问题持续存在，请联系我们。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "这则帖文声称发布于 <0>{0}，但首次出现在 Bluesky 的时间为 <1>{1}。" @@ -10176,11 +9469,7 @@ msgstr "讨论串偏好设置" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "威胁或煽动行为" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10230,17 +9519,10 @@ msgstr "话题" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "翻译" @@ -10259,11 +9541,7 @@ msgstr "热门视频" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "引战" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10366,22 +9644,13 @@ msgstr "取消屏蔽" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "取消屏蔽账户" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "要取消屏蔽账户吗？" @@ -10403,16 +9672,8 @@ msgstr "取消转发" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "取消转发（{0, plural, one {# 次转发} other {# 次转发}}）" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "取消关注" +msgstr "取消转发（{0, plural, one {# 次转发} other {# 次转发}}）<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "取消关注 {0}" @@ -10440,32 +9701,18 @@ msgstr "未知的认证人" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "" -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "未标记的成人内容" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "未标记、具骚扰性，或非自愿的成人内容" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "取消喜欢" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "取消喜欢（{0, plural, one {# 次喜欢} other {# 次喜欢}}）" @@ -10576,16 +9823,8 @@ msgstr "已从列表中取消订阅" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "不支持的视频类型：{mimeType}" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "不受欢迎的色情内容" +msgstr "不支持的视频类型：{mimeType}<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10635,20 +9874,20 @@ msgstr "将文本文件上传至：" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "从相机上传" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "从文件上传" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "从照片图库上传" @@ -10661,7 +9900,7 @@ msgstr "正在上传图片……" msgid "Uploading link thumbnail..." msgstr "正在上传链接缩略图……" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "正在上传视频……" @@ -10915,7 +10154,7 @@ msgstr "无法找到视频。" msgid "Video settings" msgstr "视频设置" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "已上传视频" @@ -10940,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "查看" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "查看 {0} 的头像" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10966,15 +10209,10 @@ msgstr "查看博客文章以获取更多资讯" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "查看调试项目" +msgstr "查看调试项目<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "查看详情" @@ -11010,10 +10248,6 @@ msgstr "查看帖文" msgid "View profile" msgstr "查看个人资料" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "查看头像" @@ -11057,15 +10291,10 @@ msgstr "查看你隐藏的账户" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "查看你的认证" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "查看你的认证<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "查看完整图片" @@ -11075,24 +10304,16 @@ msgstr "进入沉浸模式观看视频" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "暴力或威胁性内容>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "暴力" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "暴力或威胁性内容" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11242,7 +10463,7 @@ msgstr "很抱歉，我们无法解析此列表。如果问题持续发生，请 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "很抱歉，我们无法加载你的隐藏字词列表。请重试。" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "很抱歉，无法完成你的搜索。请重试。" @@ -11343,11 +10564,7 @@ msgstr "为什么要申诉？" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "此对话为何需要受到审核？" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,10 +10594,6 @@ msgstr "此用户为何需要受到审核？" msgid "Would you like to block this user and/or delete this conversation?" msgstr "需要屏蔽该用户、删除整个对话，或两者一并执行吗？" -#: src/components/dms/AfterReportDialog.tsx:49 -msgid "Would you like to block this account or delete this conversation?" -msgstr "" - #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 msgid "Write a message" @@ -11813,11 +11026,7 @@ msgstr "你正在使用应用密码登录账户，请改用你的主密码登录 #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "你已经对此标记提出过申诉，我们的审核团队正在核实申诉内容。" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/zh-HK/messages.po b/src/locale/locales/zh-HK/messages.po index 70ac80ae4..795632c08 100644 --- a/src/locale/locales/zh-HK/messages.po +++ b/src/locale/locales/zh-HK/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {擁躉} other {擁躉}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {跟緊} other {跟緊}}" +msgstr "{0, plural, one {跟緊} other {跟緊}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {讚佢} other {讚佢}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {帖文} other {帖文}}" +msgstr "{0, plural, one {帖文} other {帖文}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {引用} other {引用}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {轉發} other {轉發}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {引用} other {引用}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {轉發} other {轉發}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {個收藏} other {個收藏}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+其他 # 個新手包}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0}（帳號）" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>登入<1>或<2>建立帳號<3><4>就可以搵到新聞、體育、政治，同埋 Bluesky 上面嘅大小事。" @@ -587,11 +567,7 @@ msgstr "關於" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "虐待或歧視行爲" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "無障礙" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "無障礙設定" +msgstr "無障礙設定<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "帳號" +msgstr "帳號<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "帳號經已封鎖" @@ -669,26 +634,18 @@ msgstr "帳號經已被清單靜音" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "帳號設定" +msgstr "帳號設定<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "帳號經已喺快速存取度移除" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "帳號經已解除封鎖" @@ -778,7 +735,7 @@ msgstr "加多個帳號" msgid "Add another post" msgstr "加多另一條帖文" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "加多另一條帖文到討論串" @@ -889,20 +846,12 @@ msgstr "色情" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人內容" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "成人內容" @@ -921,11 +870,7 @@ msgstr "成人內容標記" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人性虐待內容" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "呢張圖解說明 Bluesky 所揀受信任嘅驗證者，兼由受信任嘅驗證者授權驗證個別嘅帳號。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "問題唔喺上高嗰啲選項度" @@ -1171,19 +1112,11 @@ msgstr "同" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "動物性虐待" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "虐待動物" ->>>>>>> upstream/main +msgstr "虐待動物>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "同你介紹 Bluesky 上嘅認證機制" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "反社會行爲" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "同你介紹 Bluesky 上嘅認證機制<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "App 專用密碼嘅名稱必須至少有4個字元" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App 專用密碼" +msgstr "App 專用密碼<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "App 專用密碼" @@ -1307,19 +1225,12 @@ msgstr "申請解除停權" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "對此決定提出申訴" +msgstr "對此決定提出申訴<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "外觀" @@ -1331,23 +1242,14 @@ msgstr "使用預設嘅推薦動態源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "套用 Pull Request" +msgstr "套用 Pull Request<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "封存於 {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "封存於 {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "封存咗嘅帖文" @@ -1416,18 +1318,11 @@ msgstr "爲演算法指定主題" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少 8 個字元" +msgstr "至少 8 個字元<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "極光" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "用到" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "用到" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "返去傾偈" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "違禁活動或違反保安規定行爲" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "停權用戶嘗試逃避懲罰" ->>>>>>> upstream/main +msgstr "停權用戶嘗試逃避懲罰>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "請填寫下低欄位，以開始年齡驗證流程。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日" +msgstr "生日<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "封鎖" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "封鎖帳號" @@ -1579,15 +1446,8 @@ msgstr "封鎖帳號" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "封鎖兼刪除" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "封鎖兼刪除對話" +msgstr "封鎖兼刪除<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "封鎖清單" @@ -1607,18 +1467,14 @@ msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "封鎖用戶" +msgstr "封鎖用戶<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "封鎖呢個用戶或刪除呢個對話（複選）" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "已被封鎖" @@ -1650,40 +1506,18 @@ msgstr "封鎖嘅帳號公開。被封鎖嘅帳號唔得喺你嘅討論串度回 #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "封鎖帳號唔會阻止佢標記你嘅帳號，但係會阻止佢喺你嘅討論串度回覆或同你互動。" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky 無法確認貼文發布日期嘅真實性。" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "網誌" +msgstr "封鎖帳號唔會阻止佢標記你嘅帳號，但係會阻止佢喺你嘅討論串度回覆或同你互動。<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky 無法確認貼文發布日期嘅真實性。" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky Classic™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky 係一個開放嘅網絡，你可以去揀其他託管服務提供者。若然你係開發人員，仲可以自己托管伺服器。" @@ -1735,15 +1569,9 @@ msgstr "書" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "違反網站規定" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "喺探索頁面瀏覽更多帳號" @@ -1854,19 +1682,13 @@ msgstr "相機" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "取消重新啓動兼登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "唔再搵嘢" +msgstr "唔再搵嘢<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "唔得同被封鎖嘅用戶互動" @@ -1955,11 +1771,7 @@ msgstr "變更密碼對話框" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "變更擧報類別" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "傾偈邀請" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "喺下低輸入傳送到你電郵嘅驗證碼：" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "兒童安全" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "兒童性虐待內容（CSAM）" ->>>>>>> upstream/main +msgstr "兒童性虐待內容（CSAM）>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "Clip 🐴 clop 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "刪咗歡迎介面" msgid "Closes password update alert" msgstr "閂咗密碼更新警示" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "閂咗帖文編輯器兼棄置草稿" @@ -2350,7 +2142,7 @@ msgstr "撰寫最多 {0, plural,other {# 個字元}}嘅帖文" msgid "Compose reply" msgstr "撰寫回覆" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "壓縮緊條片……" @@ -2472,11 +2264,7 @@ msgstr "睇唔到呢個內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "鼓吹或提倡自殘內容" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "複製發布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "複製程式碼" +msgstr "複製程式碼<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "複製 DID" @@ -2756,7 +2538,7 @@ msgstr "建立帳號" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "建立一個帳號" @@ -2817,35 +2599,16 @@ msgstr "自訂" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自訂選項" +msgstr "自訂選項<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "調整邊啲人可以喺呢條帖文度互動。" - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "自訂你嘅 Bluesky 體驗" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "危險挑戰或活動" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "危險物質或藥物濫用" @@ -2854,7 +2617,6 @@ msgstr "危險物質或藥物濫用" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "深色" @@ -2891,19 +2653,13 @@ msgstr "偵錯面板" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "Deepfake 成人內容" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "預設" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "預設圖標" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "停用電郵雙重驗證" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "停用觸覺回饋" +msgstr "停用觸覺回饋<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3182,7 +2926,7 @@ msgstr "發掘新嘅動態源" msgid "Dismiss" msgstr "跳過" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "跳過錯誤" @@ -3270,11 +3014,8 @@ msgstr "唔使驚！你所有現存嘅訊息同設定都經已儲存，只要驗 #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3322,9 +3063,8 @@ msgstr "下載 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下載 CAR 檔案" +msgstr "下載 CAR 檔案<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3347,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "網上起底" ->>>>>>> upstream/main +msgstr "網上起底>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3396,11 +3131,7 @@ msgstr "例如：不停用廣告洗版嘅用戶。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "飲食失調" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3417,7 +3148,7 @@ msgid "Edit" msgstr "編輯" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "編輯頭像" @@ -3692,7 +3423,7 @@ msgstr "進入全螢幕" msgid "Entertainment" msgstr "娛樂" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "錯誤" @@ -3713,11 +3444,11 @@ msgstr "錯誤資訊" msgid "Error occurred while saving file" msgstr "儲存檔案嗰陣發生錯誤" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "接收 CAPTCHA 回覆嗰陣發生錯誤。" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "錯誤：{error}" @@ -3739,19 +3470,8 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他內容" +msgstr "其他內容<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "頻繁提及或回覆" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "頻繁或不受歡迎嘅訊息" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "排除你跟嘅用戶" @@ -3875,11 +3595,7 @@ msgstr "外部媒體偏好設定" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "極端主義內容" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4083,23 +3799,13 @@ msgstr "驗證唔到帳號代碼，唔該試多次。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "虛假帳號或機械人" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "散播選擧相關虛假資訊" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "動態源" @@ -4240,26 +3946,8 @@ msgstr "攪掂" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "啞黑" +msgstr "健康<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "啞藍" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "啞白" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "靈活" @@ -4270,16 +3958,7 @@ msgstr "靈活" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "跟佢" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "跟佢" @@ -4322,16 +4001,8 @@ msgstr "跟晒所有帳號" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "跟返佢" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "跟返佢" @@ -4371,13 +4042,9 @@ msgstr "你識嘅擁躉" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "跟緊" @@ -4385,16 +4052,11 @@ msgstr "跟緊" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "跟緊" +msgstr "跟緊<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "跟緊 {0}" @@ -4481,15 +4143,8 @@ msgstr "唔記得？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "光復 Timeline" +msgstr "光復 Timeline<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "頻繁發布不受歡迎嘅內容" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "嚟自" @@ -4590,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "整張相喺你嘅 profile 嗰度先啦" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "明顯違反法律或服務條款" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "歌頌暴力" ->>>>>>> upstream/main +msgstr "整張相喺你嘅 profile 嗰度先啦<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4711,18 +4356,7 @@ msgstr "敏感媒體" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "寫實暴力內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4730,8 +4364,7 @@ msgstr "性誘識行爲" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "黑客入侵或系統攻擊" ->>>>>>> upstream/main +msgstr "黑客入侵或系統攻擊>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4762,24 +4395,8 @@ msgstr "觸覺" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "騷擾、惡搞或歧視行爲" -======= -msgstr "騷擾或仇恨" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "有害或高風險活動" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "侵害或危害未成年人" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4798,11 +4415,7 @@ msgstr "標籤 {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "仇恨言論" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4811,15 +4424,10 @@ msgstr "有咗代碼？<0>撳呢度。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到問題？" +msgstr "遇到問題？<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4878,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隱藏自訂選項" +msgstr "隱藏自訂選項<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "幫我隱藏帖文" @@ -5014,11 +4613,7 @@ msgstr "我哋應該點樣打開呢條連結？" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "人口販賣" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5082,17 +4677,9 @@ msgstr "若然你係開發人員，你可以自己托管伺服器。" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "喺停用帳號前，記得確認你係咪需要變更你嘅帳號代碼或電郵。" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "違法" +msgstr "喺停用帳號前，記得確認你係咪需要變更你嘅帳號代碼或電郵。<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "圖片" @@ -5112,29 +4699,15 @@ msgstr "圖片經已儲存" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "儲存唔到圖片，需要授予相片圖庫取用權限。" +msgstr "儲存唔到圖片，需要授予相片圖庫取用權限。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "冒認、僞造身份或所隸屬關係" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "冒充、虛假資訊或虛假聲稱" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "冒充身份" ->>>>>>> upstream/main +msgstr "冒充身份>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5162,15 +4735,8 @@ msgstr "App 內，推播，所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "App 內，推播，你跟嘅人" +msgstr "App 內，推播，你跟嘅人<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "不當嘅訊息或敏感內容連結" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5198,21 +4764,13 @@ msgstr "輸入密碼去刪除帳號" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "輸入電郵到你嘅驗證碼" +msgstr "輸入電郵到你嘅驗證碼<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "已限制互動" @@ -5286,7 +4844,7 @@ msgstr "而家新手包只有 <0>{0}！用上高嘅搵嘢功能，將更多 msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "而家淨係得你一個人！用上高搵嘢功能將更加多人擺到落你嘅新手包度。" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "作業 ID：{0}" @@ -5329,17 +4887,13 @@ msgstr "{0} 所標記。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "發布者所標記。" +msgstr "發布者所標記。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "標記" @@ -5404,17 +4958,9 @@ msgstr "想知多啲" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "想知多啲年齡驗證" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "想知多啲 Bluesky" +msgstr "想知多啲年齡驗證<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "想知多啲點樣自行架設 PDS。" @@ -5449,15 +4995,10 @@ msgstr "想知多啲 Bluesky 上面公開嘅內容。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "想知多啲去你嘅<0>帳號設定。" +msgstr "想知多啲去你嘅<0>帳號設定。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "想知多啲。" @@ -5521,11 +5062,7 @@ msgid "Like" msgstr "讚佢" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "讚佢（{0, plural, one {# 人讚佢} other {# 人讚佢}}）" @@ -5588,13 +5125,9 @@ msgstr "讚好你轉發嘅帖文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "讚好你轉發嘅帖文之通知" +msgstr "讚好你轉發嘅帖文之通知<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "呢條帖文嘅讚數" @@ -5898,49 +5431,24 @@ msgstr "訊息選項" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "傾偈" +msgstr "傾偈<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "半夜" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "輕度騷擾或欺凌" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "其他通知" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "誤導性帳號" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "誤導性帖文" -======= -msgstr "誤導" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6000,15 +5508,10 @@ msgstr "內容審覈工具" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "內容審覈服務提供者經已將呢個內容標記普通警告。" +msgstr "內容審覈服務提供者經已將呢個內容標記普通警告。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "更多動態源" @@ -6149,18 +5652,8 @@ msgstr "我嘅動態源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名稱" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "名稱或簡介違反社羣標準" +msgstr "名稱<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6364,16 +5857,11 @@ msgstr "冇圖片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "仲未有人讚" +msgstr "仲未有人讚<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "唔再跟住 {0}" @@ -6385,7 +5873,7 @@ msgstr "仲未有訊息" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "告別無謂杞人憂天嘅垃圾資訊演算法，搵啲益你而非害你嘅動態源。" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "仲未有通知！" @@ -6439,9 +5927,9 @@ msgstr "搵唔到結果" msgid "No results found for \"{query}\"" msgstr "搵唔到「{query}」嘅結果。" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "搵唔到 {query} 嘅結果" @@ -6481,11 +5969,7 @@ msgstr "搵唔到人，試下搵第個。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "非自願嘅私密影像（NCII）" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6580,15 +6064,8 @@ msgstr "而家" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸體" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "未貼上呢類標記嘅裸體或成人內容" +msgstr "裸體<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6609,11 +6086,7 @@ msgid "OK" msgstr "好嘅" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "好嘅" @@ -6714,7 +6187,7 @@ msgid "Open drawer menu" msgstr "打開櫃桶選單" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "打開 Emoji 選擇器" @@ -6814,7 +6287,7 @@ msgstr "打開帖文編輯器" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "開啓裝置相片圖庫去揀選最多 {MAX_IMAGES, plural, other {# 張圖片}}、1 條影片或 1 張 GIF。" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "打開 Emoji 選擇器" @@ -6854,15 +6327,10 @@ msgstr "打開密碼重設表單" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "打開帖文語言設定" +msgstr "打開帖文語言設定<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "打開呢個人嘅個人檔案" @@ -6896,12 +6364,7 @@ msgstr "OTA狀態：冇更新" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "其他" @@ -6911,35 +6374,8 @@ msgstr "其他帳號" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "其他兒童安全問題" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "其他危險內容" @@ -6962,8 +6398,7 @@ msgstr "其他性虐待內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力內容" ->>>>>>> upstream/main +msgstr "其他暴力內容>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7039,23 +6474,16 @@ msgstr "跟緊 @{0} 嘅人" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我跟嘅人" +msgstr "我跟嘅人<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "相片圖庫取用權限被拒絕，請喺系統設定度授予權限。" @@ -7312,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "帖文" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "發布" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "發晒佢哋" @@ -7340,19 +6768,12 @@ msgstr "帖文經已刪除" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "帖文發布失敗。請檢查你嘅互聯網連線，跟住試多次。" +msgstr "帖文發布失敗。請檢查你嘅互聯網連線，跟住試多次。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "帖文經已刪除" @@ -7486,13 +6907,9 @@ msgstr "私隱政策" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "侵犯未成年人私隱" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "處理緊條片……" @@ -7520,13 +6937,10 @@ msgstr "個人檔案經已更新" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD -======= -msgstr "宣傳或售賣違禁物品或服務" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 @@ -7542,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "公開、可分享嘅清單，可以當動態源噉用。" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "發布帖文" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "發布帖文" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "發布回覆" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "發布回覆" @@ -7620,13 +7034,9 @@ msgstr "引用帖文經已停用" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用" +msgstr "引用<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "引用呢條篇帖文" @@ -7687,12 +7097,12 @@ msgstr "睇下 Bluesky 服務條款" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7783,8 +7193,8 @@ msgstr "刪除關聯" msgid "Remove Avatar" msgstr "刪除頭像" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "刪除橫額" @@ -7958,17 +7368,13 @@ msgstr "回覆經已停用" msgid "Replies to this post are disabled." msgstr "呢條帖文嘅回覆經已關閉。" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "回覆" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "回覆（{0, plural, one {# 個回覆} other {# 個回覆}}）" @@ -8058,11 +7464,7 @@ msgstr "擧報經已提交" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "擧報此對話" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8133,13 +7535,9 @@ msgstr "你所轉發" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "轉發" +msgstr "轉發<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "轉發呢條帖文" @@ -8212,17 +7610,13 @@ msgstr "去返引導流程重設個人檔案" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重設密碼" +msgstr "重設密碼<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "試多次登入" @@ -8375,28 +7769,21 @@ msgstr "Say 哈嘍！" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "詐騙" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科學" +msgstr "科學<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "向左捲動" @@ -8441,11 +7828,11 @@ msgstr "搵「{interestsDisplayName}」" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "搵「{interestsDisplayName}」（已揀選）" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "搵「{query}」" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "搵「{searchText}」" @@ -8470,7 +7857,7 @@ msgid "Search GIFs" msgstr "搵 GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "未登入狀態用唔到搵嘢功能" @@ -8563,11 +7950,7 @@ msgstr "揀一隻色" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "揀選一個理由" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8704,11 +8087,7 @@ msgstr "唔支援揀選多種媒體類型。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "自殘或其他危險行爲" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8778,19 +8157,12 @@ msgstr "設定出世日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "設定新密碼" +msgstr "設定新密碼<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "設定你嘅帳號" @@ -8942,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9032,15 +8400,10 @@ msgstr "顯示回覆" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "回覆顯示成" +msgstr "回覆顯示成<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "公開顯示回覆" @@ -9060,13 +8423,9 @@ msgstr "顯示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "顯示警告兼且喺動態源度篩選" +msgstr "顯示警告兼且喺動態源度篩選<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "顯示關於呢條帖文嘅建立時間資訊" @@ -9087,7 +8446,7 @@ msgstr "顯示內容" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9294,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "來源：<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "垃圾訊息" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "垃圾訊息、頻繁提及或回覆" -======= -msgstr "垃圾訊息或其他虛假欺騙行爲" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9467,23 +8813,9 @@ msgstr "估你心水" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示" +msgstr "性暗示<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "日出" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "日落" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9555,11 +8887,7 @@ msgstr "撳下即跳過" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "針對性騷擾" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9605,18 +8933,8 @@ msgstr "條款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服務條款" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "所用嘅文字違反咗社羣標準" - -======= ->>>>>>> upstream/main +msgstr "服務條款<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "字詞同標籤" @@ -9665,11 +8983,7 @@ msgid "That's everything!" msgstr "就係咁多喇！" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "解除封鎖之後，呢個帳號就可以同你互動。" @@ -9801,17 +9115,12 @@ msgstr "連線到伺服器嗰陣出咗問題" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "連線到伺服器嗰陣出咗問題，請檢查互聯網連線跟住試多次。" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "攞緊通知嗰陣出咗問題，撳呢度試多次。" +msgstr "攞緊通知嗰陣出咗問題，撳呢度試多次。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "攞緊帖文嗰陣出咗問題，撳呢度試多次。" @@ -9850,16 +9159,9 @@ msgstr "更新你嘅動態源嗰陣出咗問題，請檢查你嘅互聯網連線 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9887,19 +9189,14 @@ msgstr "應用程式出現咗一個估都估唔到嘅問題。若然你有呢種 #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "Bluesky 家陣有一大班人加入！我哋會盡快啓用你嘅帳號。" +msgstr "Bluesky 家陣有一大班人加入！我哋會盡快啓用你嘅帳號。<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10052,13 +9349,9 @@ msgstr "呢份清單度得個吉。" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "呢個內容審覈服務用唔到，留意下低瞭解更多資訊。若然呢個問題仲係持續發生，請聯絡我哋。" +msgstr "呢個內容審覈服務用唔到，留意下低瞭解更多資訊。若然呢個問題仲係持續發生，請聯絡我哋。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "呢條帖文話係話喺 <0>{0} 發布嘅，但係最先出現喺 Bluesky 嘅時間係喺 <1>{1}。" @@ -10176,11 +9469,7 @@ msgstr "討論串偏好設定" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "威脅或煽動暴力" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10230,17 +9519,10 @@ msgstr "話題" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "翻譯" @@ -10259,11 +9541,7 @@ msgstr "時興影片" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "引戰" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10366,22 +9644,13 @@ msgstr "解除封鎖" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "解除封鎖帳號" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "係咪要解除封鎖帳號？" @@ -10403,16 +9672,8 @@ msgstr "唔再轉發" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "唔再轉發（{0, plural, one {# 次轉發} other {# 次轉發}}）" - -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "唔再跟佢" +msgstr "唔再轉發（{0, plural, one {# 次轉發} other {# 次轉發}}）<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "唔再跟 {0}" @@ -10440,32 +9701,18 @@ msgstr "未知嘅驗證者" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "未標記嘅成人內容" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "未標記、具虐待性、或非自願嘅成人內容" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "唔再讚佢" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "唔再讚佢（{0, plural, one {# 人讚佢} other {# 人讚佢}}）" @@ -10576,16 +9823,8 @@ msgstr "經已喺清單度唔再訂閱" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "唔支援嘅影片類型：{mimeType}" +msgstr "唔支援嘅影片類型：{mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "不受歡迎嘅色情內容" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10635,20 +9874,20 @@ msgstr "上載文字檔案到：" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "喺相機度上載" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "喺檔案度上載" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "喺相片圖庫度上載" @@ -10661,7 +9900,7 @@ msgstr "上載緊圖片……" msgid "Uploading link thumbnail..." msgstr "上載緊連結縮圖……" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "上載緊條片……" @@ -10915,7 +10154,7 @@ msgstr "搵唔到條片。" msgid "Video settings" msgstr "影片設定" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "影片上載成功" @@ -10940,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "睇下" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "睇下 {0} 嘅頭像" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10966,15 +10209,10 @@ msgstr "睇下網誌文章嚟了解更多資訊" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "睇下調試條目" +msgstr "睇下調試條目<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "睇下詳細資訊" @@ -11010,10 +10248,6 @@ msgstr "睇下帖文" msgid "View profile" msgstr "睇下個人檔案" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "睇下頭像" @@ -11057,15 +10291,10 @@ msgstr "睇下你靜音咗嘅帳號" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "睇下你嘅認證" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "睇下你嘅認證<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "睇下完整圖片" @@ -11075,24 +10304,16 @@ msgstr "進入沉浸模式睇片" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "暴力或威嚇性內容>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "暴力" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "暴力或威嚇性內容" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11242,7 +10463,7 @@ msgstr "對唔住，但係我哋解析唔到呢份清單。若然呢個問題仲 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "對唔住，我哋而家撈唔到你啲靜音字詞。唔該試多次。" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "對唔住，你嘅搵嘢任務未攪得掂。唔該等多幾分鐘試下。" @@ -11343,11 +10564,7 @@ msgstr "點解你要申訴？" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "點解要審查呢個對話？" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11374,13 +10591,8 @@ msgid "Why should this user be reviewed?" msgstr "點解要審查呢個用戶？" #: src/components/dms/AfterReportDialog.tsx:49 -<<<<<<< HEAD -msgid "Would you like to block this account or delete this conversation?" -msgstr "" -======= msgid "Would you like to block this user and/or delete this conversation?" -msgstr "需要封鎖呢個用戶或刪除呢個對話，定一齊執行？" ->>>>>>> upstream/main +msgstr "需要封鎖呢個用戶或刪除呢個對話，定一齊執行？>>>>>>> upstream/main" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 @@ -11814,11 +11026,7 @@ msgstr "你而家用緊 App 專用密碼去登入。請用返你嘅主要密碼 #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "你經已對呢個標記提出過申訴，而家我哋嘅內容審覈團隊審查緊。" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 diff --git a/src/locale/locales/zh-TW/messages.po b/src/locale/locales/zh-TW/messages.po index 373b19505..987761e33 100644 --- a/src/locale/locales/zh-TW/messages.po +++ b/src/locale/locales/zh-TW/messages.po @@ -98,21 +98,16 @@ msgstr "{0, plural, one {個跟隨者} other {個跟隨者}}" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "{0, plural, one {個跟隨中} other {個跟隨中}}" +msgstr "{0, plural, one {個跟隨中} other {個跟隨中}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:477 ->>>>>>> upstream/main msgid "{0, plural, one {like} other {likes}}" msgstr "{0, plural, one {個喜歡} other {個喜歡}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {則貼文} other {則貼文}}" +msgstr "{0, plural, one {則貼文} other {則貼文}}<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" msgstr "{0, plural, one {次引用} other {次引用}}" @@ -123,17 +118,6 @@ msgid "{0, plural, one {repost} other {reposts}}" msgstr "{0, plural, one {則轉發} other {則轉發}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:505 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:461 -msgid "{0, plural, one {quote} other {quotes}}" -msgstr "{0, plural, one {次引用} other {次引用}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:443 -msgid "{0, plural, one {repost} other {reposts}}" -msgstr "{0, plural, one {則轉發} other {則轉發}}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:488 ->>>>>>> upstream/main msgid "{0, plural, one {save} other {saves}}" msgstr "{0, plural, one {個收藏} other {個收藏}}" @@ -152,11 +136,7 @@ msgstr "{0, plural, other {+其他 # 個新手包}}" #: src/components/moderation/ContentHider.tsx:89 msgid "{0} (Account)" -<<<<<<< HEAD msgstr "" -======= -msgstr "{0}（帳號）" ->>>>>>> upstream/main #. Pattern: {wordValue} in tags #: src/components/dialogs/MutedWords.tsx:481 @@ -524,7 +504,7 @@ msgid "<0>{date} at {time}" msgstr "<0>{date} {time}" #: src/screens/Hashtag.tsx:223 -#: src/screens/Search/SearchResults.tsx:257 +#: src/screens/Search/SearchResults.tsx:259 msgid "<0>Sign in<1> or <2>create an account<3> <4>to search for news, sports, politics, and everything else happening on Bluesky." msgstr "<0>登入<1>或<2>建立帳號<3><4>即可在 Bluesky 上搜尋有關新聞、體育、政治等新鮮事。" @@ -587,11 +567,7 @@ msgstr "關於" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:100 msgid "Abusive or discriminatory behavior" -<<<<<<< HEAD msgstr "" -======= -msgstr "虐待或歧視行為" ->>>>>>> upstream/main #. Accept a chat request #: src/screens/Messages/components/RequestButtons.tsx:269 @@ -619,30 +595,19 @@ msgstr "無障礙" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "無障礙設定" +msgstr "無障礙設定<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:408 -#: src/screens/Login/LoginForm.tsx:194 -======= -#: src/Navigation.tsx:399 #: src/screens/Login/LoginForm.tsx:197 ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:51 #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "帳號" +msgstr "帳號<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 #: src/view/com/profile/ProfileMenu.tsx:179 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:393 -#: src/screens/Messages/components/RequestButtons.tsx:91 -#: src/view/com/profile/ProfileMenu.tsx:166 ->>>>>>> upstream/main msgctxt "toast" msgid "Account blocked" msgstr "成功封鎖帳號" @@ -669,26 +634,18 @@ msgstr "帳號已被列表靜音" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "帳號設定" +msgstr "帳號設定<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/Settings.tsx:669 -======= #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" msgstr "" -#: src/screens/Settings/Settings.tsx:662 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:669 msgid "Account removed from quick access" msgstr "成功從快速存取中移除帳號" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:138 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:169 -======= -#: src/view/com/profile/ProfileMenu.tsx:156 ->>>>>>> upstream/main msgctxt "toast" msgid "Account unblocked" msgstr "成功解除封鎖帳號" @@ -778,7 +735,7 @@ msgstr "新增其他帳號" msgid "Add another post" msgstr "加入另一則貼文" -#: src/view/com/composer/Composer.tsx:1491 +#: src/view/com/composer/Composer.tsx:1492 msgid "Add another post to thread" msgstr "新增另一則貼文至討論串" @@ -889,20 +846,12 @@ msgstr "色情" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:66 msgid "Adult content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人內容" ->>>>>>> upstream/main #: src/components/moderation/ContentHider.tsx:120 #: src/lib/moderation/useGlobalLabelStrings.ts:34 #: src/lib/moderation/useModerationCauseDescription.ts:149 -<<<<<<< HEAD -#: src/view/com/composer/labels/LabelsBtn.tsx:127 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:122 ->>>>>>> upstream/main msgid "Adult Content" msgstr "成人內容" @@ -921,11 +870,7 @@ msgstr "成人內容標記" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:76 msgid "Adult sexual abuse content" -<<<<<<< HEAD msgstr "" -======= -msgstr "成人性虐待內容" ->>>>>>> upstream/main #: src/screens/Moderation/index.tsx:468 msgid "Advanced" @@ -1132,10 +1077,6 @@ msgid "An illustration showing that Bluesky selects trusted verifiers, and trust msgstr "這張圖解說明 Bluesky 官方可挑選信任的驗證者，並由受信任的驗證者為個別帳號授予驗證。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:239 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:28 -======= ->>>>>>> upstream/main msgid "An issue not included in these options" msgstr "問題未包含在上述選項" @@ -1171,19 +1112,11 @@ msgstr "和" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:88 msgid "Animal sexual abuse" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 -msgid "Animal welfare" msgstr "" -======= -msgstr "動物性虐待" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "虐待動物" ->>>>>>> upstream/main +msgstr "虐待動物>>>>>>> upstream/main" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1201,21 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "為您介紹 Bluesky 上的驗證機制" - -<<<<<<< HEAD -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:33 -msgid "Anti-Social Behavior" -msgstr "反社會行為" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:437 -======= +msgstr "為您介紹 Bluesky 上的驗證機制<<<<<<< HEAD<<<<<<< HEAD" + #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 ->>>>>>> upstream/main msgid "Anyone" -msgstr "" ->>>>>>> upstream/main +msgstr ">>>>>>> upstream/main" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1266,15 +1189,10 @@ msgstr "密碼名稱必須至少包含 4 個字元" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "應用程式專用密碼" +msgstr "應用程式專用密碼<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:352 -#: src/screens/Settings/AppPasswords.tsx:51 -======= -#: src/Navigation.tsx:351 #: src/screens/Settings/AppPasswords.tsx:49 ->>>>>>> upstream/main msgid "App Passwords" msgstr "應用程式專用密碼" @@ -1307,19 +1225,12 @@ msgstr "申請解除停權" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "對此決定提出上訴" +msgstr "對此決定提出上訴<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:400 -#: src/screens/Settings/AppearanceSettings.tsx:86 +#: src/screens/Settings/AppearanceSettings.tsx:73 #: src/screens/Settings/Settings.tsx:213 #: src/screens/Settings/Settings.tsx:216 -======= -#: src/Navigation.tsx:391 -#: src/screens/Settings/AppearanceSettings.tsx:73 -#: src/screens/Settings/Settings.tsx:212 -#: src/screens/Settings/Settings.tsx:215 ->>>>>>> upstream/main msgid "Appearance" msgstr "外觀" @@ -1331,23 +1242,14 @@ msgstr "使用預設推薦的動態源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "套用拉取請求 (Pull Request)" +msgstr "套用拉取請求 (Pull Request)<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" msgstr "封存於 {0}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:644 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:683 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:658 -msgid "Archived from {0}" -msgstr "封存於 {0}" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:627 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:666 ->>>>>>> upstream/main msgid "Archived post" msgstr "已封存的貼文" @@ -1416,18 +1318,11 @@ msgstr "為演算法指定主題" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少 8 個字元" +msgstr "至少 8 個字元<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "" -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:48 -msgctxt "Name of app icon variant" -msgid "Aurora" -msgstr "極光" ->>>>>>> upstream/main +msgstr "=======" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1441,13 +1336,8 @@ msgstr "可用" #: src/components/moderation/LabelsOnMeDialog.tsx:333 #: src/components/moderation/LabelsOnMeDialog.tsx:334 -<<<<<<< HEAD -#: src/screens/Login/ChooseAccountForm.tsx:90 -#: src/screens/Login/ChooseAccountForm.tsx:95 -======= #: src/screens/Login/ChooseAccountForm.tsx:91 #: src/screens/Login/ChooseAccountForm.tsx:96 ->>>>>>> upstream/main #: src/screens/Login/ForgotPasswordForm.tsx:123 #: src/screens/Login/ForgotPasswordForm.tsx:129 #: src/screens/Login/LoginForm.tsx:323 @@ -1456,7 +1346,7 @@ msgstr "可用" #: src/screens/Login/SetNewPasswordForm.tsx:174 #: src/screens/Messages/components/ChatDisabled.tsx:145 #: src/screens/Messages/components/ChatDisabled.tsx:146 -#: src/screens/Profile/Header/Shell.tsx:158 +#: src/screens/Profile/Header/Shell.tsx:214 #: src/screens/Settings/components/ChangePasswordDialog.tsx:272 #: src/screens/Settings/components/ChangePasswordDialog.tsx:281 #: src/screens/Signup/BackNextButtons.tsx:41 @@ -1470,19 +1360,11 @@ msgstr "返回對話" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:216 msgid "Banned activities or security violations" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "" -======= -msgstr "違法活動或危害安全行為" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 -msgid "Banned user returning" -msgstr "停權用戶試圖繞過懲罰" ->>>>>>> upstream/main +msgstr "停權用戶試圖繞過懲罰>>>>>>> upstream/main" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1529,9 +1411,8 @@ msgstr "請填寫以下欄位，以開始年齡驗證程序。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日" +msgstr "生日<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Signup/StepInfo/index.tsx:172 msgid "Bitchsky is part of the <0>ATmosphere—the network of apps, services, and accounts built on the AT Protocol." msgstr "" @@ -1539,31 +1420,17 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:890 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 #: src/view/com/profile/ProfileMenu.tsx:556 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:792 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:336 -#: src/view/com/profile/ProfileMenu.tsx:495 ->>>>>>> upstream/main msgid "Block" msgstr "封鎖" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:775 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:777 #: src/screens/Messages/components/RequestButtons.tsx:144 #: src/screens/Messages/components/RequestButtons.tsx:146 #: src/view/com/profile/ProfileMenu.tsx:462 #: src/view/com/profile/ProfileMenu.tsx:469 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:677 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:679 -#: src/screens/Messages/components/RequestButtons.tsx:144 -#: src/screens/Messages/components/RequestButtons.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:401 -#: src/view/com/profile/ProfileMenu.tsx:408 ->>>>>>> upstream/main msgid "Block account" msgstr "封鎖帳號" @@ -1579,15 +1446,8 @@ msgstr "封鎖帳號" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "封鎖並刪除" - -<<<<<<< HEAD -#: src/components/dms/AfterReportDialog.tsx:180 -msgid "Block and/or delete this conversation" -msgstr "封鎖 & 刪除對話" +msgstr "封鎖並刪除<<<<<<< HEAD" -======= ->>>>>>> upstream/main #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" msgstr "封鎖列表" @@ -1607,18 +1467,14 @@ msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "封鎖用戶" +msgstr "封鎖用戶<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/Post/Embed/index.tsx:207 -#: src/components/Post/Embed/index.tsx:214 -======= #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" msgstr "封鎖此帳號或刪除整個對話（複選）" -#: src/components/Post/Embed/index.tsx:186 ->>>>>>> upstream/main +#: src/components/Post/Embed/index.tsx:207 +#: src/components/Post/Embed/index.tsx:214 msgid "Blocked" msgstr "已被封鎖" @@ -1650,40 +1506,18 @@ msgstr "您封鎖的帳號對所有人可見。他們無法提及您、在您的 #: src/view/com/profile/ProfileMenu.tsx:548 msgid "Blocking will not prevent labels from being applied on your account, but it will stop this account from replying in your threads or interacting with you." -msgstr "封鎖該帳號無法阻止其標記您的帳號，但他將無法在您的討論串中回覆，或以其他方式與您互動。" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:136 -#: src/view/com/auth/server-input/index.tsx:137 -msgid "Bluesky" -msgstr "Bluesky" - -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 -msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "Bluesky 無法確認貼文發布日期的真實性。" - -#: src/view/com/auth/server-input/index.tsx:212 -======= -#: src/view/com/auth/SplashScreen.web.tsx:179 -msgid "Blog" -msgstr "部落格" +msgstr "封鎖該帳號無法阻止其標記您的帳號，但他將無法在您的討論串中回覆，或以其他方式與您互動。<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 msgid "Bluesky" msgstr "Bluesky" -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:688 +#: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." msgstr "Bluesky 無法確認貼文發布日期的真實性。" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:165 -msgctxt "Name of app icon variant" -msgid "Bluesky Classic™" -msgstr "Bluesky 經典™" - #: src/components/dialogs/ServerInput.tsx:217 ->>>>>>> upstream/main msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." msgstr "Bluesky 是一個開放的網路，您可以自行挑選託管服務提供者。如果您是開發人員，也可以託管自己的伺服器。" @@ -1735,15 +1569,9 @@ msgstr "書籍" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -<<<<<<< HEAD msgstr "" #: src/components/FeedInterstitials.tsx:442 -======= -msgstr "違反網站規定" - -#: src/components/FeedInterstitials.tsx:436 ->>>>>>> upstream/main msgid "Browse more accounts on the Explore page" msgstr "在探索頁面瀏覽更多帳號" @@ -1854,19 +1682,13 @@ msgstr "相機" #: src/screens/Settings/AppIconSettings/index.tsx:230 #: src/screens/Settings/components/ChangeHandleDialog.tsx:78 #: src/screens/Settings/components/ChangeHandleDialog.tsx:85 -<<<<<<< HEAD -#: src/screens/Settings/components/ChangePasswordDialog.tsx:246 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:252 -#: src/screens/Settings/Settings.tsx:296 -======= #: src/screens/Settings/components/ChangePasswordDialog.tsx:247 #: src/screens/Settings/components/ChangePasswordDialog.tsx:253 -#: src/screens/Settings/Settings.tsx:289 ->>>>>>> upstream/main +#: src/screens/Settings/Settings.tsx:296 #: src/screens/Takendown.tsx:108 #: src/screens/Takendown.tsx:111 -#: src/view/com/composer/Composer.tsx:1048 -#: src/view/com/composer/Composer.tsx:1059 +#: src/view/com/composer/Composer.tsx:1049 +#: src/view/com/composer/Composer.tsx:1060 #: src/view/com/composer/photos/EditImageDialog.web.tsx:43 #: src/view/com/composer/photos/EditImageDialog.web.tsx:52 #: src/view/shell/desktop/LeftNav.tsx:213 @@ -1894,17 +1716,11 @@ msgstr "取消重新啟用並登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "放棄搜尋" +msgstr "放棄搜尋<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 #: src/components/PostControls/index.tsx:173 -======= -#: src/components/PostControls/index.tsx:106 -#: src/components/PostControls/index.tsx:137 -#: src/components/PostControls/index.tsx:165 ->>>>>>> upstream/main #: src/state/shell/composer/index.tsx:94 msgid "Cannot interact with a blocked user" msgstr "無法與被封鎖的用戶進行互動" @@ -1955,11 +1771,7 @@ msgstr "變更密碼對話框" #: src/components/moderation/ReportDialog/index.tsx:289 msgid "Change report category" -<<<<<<< HEAD msgstr "" -======= -msgstr "變更檢舉類別" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/index.tsx:369 msgid "Change report reason" @@ -2021,11 +1833,7 @@ msgid "Chat requests" msgstr "對話邀請" #: src/components/dms/ConvoMenu.tsx:78 -<<<<<<< HEAD #: src/Navigation.tsx:563 -======= -#: src/Navigation.tsx:554 ->>>>>>> upstream/main #: src/screens/Messages/ChatList.tsx:81 #: src/screens/Messages/ChatList.tsx:85 #: src/screens/Messages/ChatList.tsx:380 @@ -2062,19 +1870,11 @@ msgstr "在下方輸入傳送至您電子信箱的驗證碼：" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:161 msgid "Child safety" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "" -======= -msgstr "兒少安全" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 -msgid "Child Sexual Abuse Material (CSAM)" -msgstr "兒少性剝削內容 (CSAM)" ->>>>>>> upstream/main +msgstr "兒少性剝削內容 (CSAM)>>>>>>> upstream/main" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2196,19 +1996,11 @@ msgstr "達達的馬蹄 🐴 是美麗的錯誤 🐴" #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:118 #: src/components/StarterPack/Wizard/WizardEditListDialog.tsx:124 #: src/components/verification/VerificationsDialog.tsx:144 -<<<<<<< HEAD #: src/components/verification/VerifierDialog.tsx:155 -#: src/components/WhoCanReply.tsx:202 -#: src/components/WhoCanReply.tsx:209 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:286 -#: src/screens/Settings/components/ChangePasswordDialog.tsx:291 -======= -#: src/components/verification/VerifierDialog.tsx:150 #: src/components/WhoCanReply.tsx:234 #: src/components/WhoCanReply.tsx:241 #: src/screens/Settings/components/ChangePasswordDialog.tsx:287 #: src/screens/Settings/components/ChangePasswordDialog.tsx:292 ->>>>>>> upstream/main #: src/view/com/composer/select-language/PostLanguageSelectDialog.tsx:335 #: src/view/com/feeds/MissingFeed.tsx:210 #: src/view/com/feeds/MissingFeed.tsx:217 @@ -2278,7 +2070,7 @@ msgstr "關閉歡迎介面" msgid "Closes password update alert" msgstr "關閉密碼更新警告" -#: src/view/com/composer/Composer.tsx:1056 +#: src/view/com/composer/Composer.tsx:1057 msgid "Closes post composer and discards post draft" msgstr "關閉貼文編輯器並捨棄草稿" @@ -2350,7 +2142,7 @@ msgstr "撰寫最多 {0, plural,other {# 個字元}}的貼文" msgid "Compose reply" msgstr "撰寫回覆" -#: src/view/com/composer/Composer.tsx:1886 +#: src/view/com/composer/Composer.tsx:1887 msgid "Compressing video..." msgstr "正在壓縮影片……" @@ -2472,11 +2264,7 @@ msgstr "無法檢視這項內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:192 msgid "Content promoting or depicting self-harm" -<<<<<<< HEAD msgstr "" -======= -msgstr "宣揚或提倡自殘內容" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:52 #: src/components/moderation/ScreenHider.tsx:99 @@ -2584,17 +2372,11 @@ msgstr "複製發布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "複製程式碼" +msgstr "複製程式碼<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Settings/components/ChangeHandleDialog.tsx:501 +#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 #: src/view/com/profile/ProfileMenu.tsx:511 -======= -#: src/screens/Settings/components/ChangeHandleDialog.tsx:502 -#: src/view/com/profile/ProfileMenu.tsx:447 -#: src/view/com/profile/ProfileMenu.tsx:450 ->>>>>>> upstream/main msgid "Copy DID" msgstr "複製 DID" @@ -2756,7 +2538,7 @@ msgstr "建立帳號" #: src/components/dialogs/Signin.tsx:86 #: src/components/dialogs/Signin.tsx:88 #: src/screens/Hashtag.tsx:232 -#: src/screens/Search/SearchResults.tsx:268 +#: src/screens/Search/SearchResults.tsx:270 msgid "Create an account" msgstr "建立帳號" @@ -2817,35 +2599,16 @@ msgstr "自訂" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自訂選項" +msgstr "自訂選項<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:111 -msgid "Customize who can interact with this post." -msgstr "調整哪些人能夠與這則貼文互動。" - -======= ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" msgstr "自訂您的 Bluesky 體驗" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:200 msgid "Dangerous challenges or activities" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 -msgid "Dangerous substances or drug abuse" msgstr "" -#: src/components/dialogs/Embed.tsx:167 -#: src/components/dialogs/Embed.tsx:169 -#: src/screens/Settings/AppearanceSettings.tsx:106 -#: src/screens/Settings/AppearanceSettings.tsx:127 -======= -msgstr "危險挑戰或活動" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" msgstr "危險物質或藥物濫用" @@ -2854,7 +2617,6 @@ msgstr "危險物質或藥物濫用" #: src/components/dialogs/Embed.tsx:170 #: src/screens/Settings/AppearanceSettings.tsx:93 #: src/screens/Settings/AppearanceSettings.tsx:114 ->>>>>>> upstream/main msgid "Dark" msgstr "深色" @@ -2891,19 +2653,13 @@ msgstr "偵錯面板" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -<<<<<<< HEAD msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" msgstr "" -#: src/screens/Settings/AppearanceSettings.tsx:169 -======= -msgstr "深度偽造 (Deepfake) 成人內容" - #: src/screens/Settings/AppearanceSettings.tsx:156 ->>>>>>> upstream/main msgid "Default" msgstr "預設" @@ -2912,17 +2668,10 @@ msgid "Default icons" msgstr "預設圖示" #: src/components/dms/MessageContextMenu.tsx:202 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:834 #: src/screens/Messages/components/ChatStatusInfo.tsx:55 #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 -#: src/screens/Settings/AppPasswords.tsx:212 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:736 -#: src/screens/Messages/components/ChatStatusInfo.tsx:55 -#: src/screens/ProfileList/components/MoreOptionsMenu.tsx:280 #: src/screens/Settings/AppPasswords.tsx:211 ->>>>>>> upstream/main #: src/screens/StarterPack/StarterPackScreen.tsx:601 #: src/screens/StarterPack/StarterPackScreen.tsx:690 #: src/screens/StarterPack/StarterPackScreen.tsx:762 @@ -3085,20 +2834,26 @@ msgstr "停用電子郵件雙重驗證" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "關閉觸覺回饋" +msgstr "關閉觸覺回饋<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 msgid "Disable Likes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 +msgid "Disable quote posts of this post" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:545 #: src/screens/Settings/DeerSettings.tsx:550 msgid "Disable Quotes Metrics" msgstr "" +#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 +msgid "Disable replies entirely" +msgstr "" + #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 msgid "Disable Reply Metrics" @@ -3112,17 +2867,6 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:608 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:622 ->>>>>>> upstream/main -msgid "Disable quote posts of this post" -msgstr "" - -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 -msgid "Disable replies entirely" ->>>>>>> upstream/main msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 @@ -3182,7 +2926,7 @@ msgstr "探索新的動態源" msgid "Dismiss" msgstr "跳過" -#: src/view/com/composer/Composer.tsx:1810 +#: src/view/com/composer/Composer.tsx:1811 msgid "Dismiss error" msgstr "跳過錯誤" @@ -3270,11 +3014,8 @@ msgstr "不用擔心！您現有的訊息和設定都已儲存，只需驗證您 #: src/components/dialogs/BirthDateSettings.tsx:149 #: src/components/dialogs/BirthDateSettings.tsx:156 -<<<<<<< HEAD -======= #: src/components/dialogs/ServerInput.tsx:240 #: src/components/dialogs/ServerInput.tsx:242 ->>>>>>> upstream/main #: src/components/dms/AfterReportDialog.tsx:142 #: src/components/forms/DateField/index.tsx:103 #: src/components/forms/DateField/index.tsx:109 @@ -3322,9 +3063,8 @@ msgstr "下載 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下載 CAR 檔案" +msgstr "下載 CAR 檔案<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 msgid "Download GIF" @@ -3347,12 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 -msgid "Doxxing" -msgstr "人肉搜尋" ->>>>>>> upstream/main +msgstr "人肉搜尋>>>>>>> upstream/main" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3396,11 +3131,7 @@ msgstr "例如：不斷發布廣告洗版的帳號。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:196 msgid "Eating disorders" -<<<<<<< HEAD msgstr "" -======= -msgstr "飲食失調" ->>>>>>> upstream/main #: src/screens/Settings/AccountSettings.tsx:145 #: src/screens/Settings/NotificationSettings/ActivityNotificationSettings.tsx:252 @@ -3417,7 +3148,7 @@ msgid "Edit" msgstr "編輯" #: src/view/com/util/UserAvatar.tsx:451 -#: src/view/com/util/UserBanner.tsx:169 +#: src/view/com/util/UserBanner.tsx:124 msgid "Edit avatar" msgstr "編輯大頭貼照" @@ -3692,7 +3423,7 @@ msgstr "進入全螢幕" msgid "Entertainment" msgstr "娛樂" -#: src/view/com/composer/Composer.tsx:1895 +#: src/view/com/composer/Composer.tsx:1896 #: src/view/com/util/error/ErrorScreen.tsx:42 msgid "Error" msgstr "錯誤" @@ -3713,11 +3444,11 @@ msgstr "錯誤資訊" msgid "Error occurred while saving file" msgstr "儲存檔案時發生錯誤" -#: src/screens/Signup/StepCaptcha/index.tsx:123 +#: src/screens/Signup/StepCaptcha/index.tsx:124 msgid "Error receiving captcha response." msgstr "取得人機驗證 (Captcha) 回應時發生錯誤。" -#: src/screens/Search/SearchResults.tsx:146 +#: src/screens/Search/SearchResults.tsx:148 msgid "Error: {error}" msgstr "錯誤：{error}" @@ -3739,19 +3470,8 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他內容" +msgstr "其他內容<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:73 -msgid "Excessive mentions or replies" -msgstr "過多的提及或回覆" - -#: src/lib/moderation/useReportOptions.ts:86 -msgid "Excessive or unwanted messages" -msgstr "過多或不受歡迎的訊息" - -======= ->>>>>>> upstream/main #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" msgstr "排除已跟隨的用戶" @@ -3875,11 +3595,7 @@ msgstr "外部媒體選項" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:146 msgid "Extremist content" -<<<<<<< HEAD msgstr "" -======= -msgstr "極端主義內容" ->>>>>>> upstream/main #: src/screens/Messages/components/RequestButtons.tsx:231 msgctxt "toast" @@ -4083,23 +3799,13 @@ msgstr "無法驗證帳號代碼，請再試一次。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:47 msgid "Fake account or bot" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 -msgid "False information about elections" -msgstr "" - -#: src/Navigation.tsx:292 -======= -msgstr "虛假帳號或機器人" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" msgstr "散播選舉相關虛假資訊" -#: src/Navigation.tsx:291 ->>>>>>> upstream/main +#: src/Navigation.tsx:292 msgid "Feed" msgstr "動態源" @@ -4240,26 +3946,8 @@ msgstr "完成" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康" - -<<<<<<< HEAD -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:149 -msgctxt "Name of app icon variant" -msgid "Flat Black" -msgstr "消光黑" +msgstr "健康<<<<<<< HEAD=======" -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:117 -msgctxt "Name of app icon variant" -msgid "Flat Blue" -msgstr "消光藍" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:133 -msgctxt "Name of app icon variant" -msgid "Flat White" -msgstr "消光白" - ->>>>>>> upstream/main #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" msgstr "靈活" @@ -4270,16 +3958,7 @@ msgstr "靈活" #: src/components/ProfileHoverCard/index.web.tsx:507 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:131 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:258 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:856 -msgid "Follow" -msgstr "跟隨" - -#: src/view/com/profile/FollowButton.tsx:72 -msgctxt "action" -======= #: src/screens/VideoFeed/index.tsx:857 ->>>>>>> upstream/main msgid "Follow" msgstr "跟隨" @@ -4322,16 +4001,8 @@ msgstr "跟隨所有帳號" #: src/components/ProfileCard.tsx:536 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:129 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:256 -<<<<<<< HEAD -msgid "Follow back" -msgstr "回跟" - -#: src/view/com/profile/FollowButton.tsx:81 -msgctxt "action" -======= #: src/view/com/notifications/NotificationFeedItem.tsx:835 #: src/view/com/notifications/NotificationFeedItem.tsx:842 ->>>>>>> upstream/main msgid "Follow back" msgstr "回跟" @@ -4371,13 +4042,9 @@ msgstr "您也認識的跟隨者" #: src/components/ProfileHoverCard/index.web.tsx:506 #: src/screens/PostThread/components/ThreadItemAnchorFollowButton.tsx:134 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:254 -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:854 -======= #: src/screens/VideoFeed/index.tsx:855 #: src/view/com/notifications/NotificationFeedItem.tsx:813 #: src/view/com/notifications/NotificationFeedItem.tsx:830 ->>>>>>> upstream/main msgid "Following" msgstr "跟隨中" @@ -4385,16 +4052,11 @@ msgstr "跟隨中" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "跟隨中" +msgstr "跟隨中<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:474 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 -======= #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 #: src/view/com/notifications/NotificationFeedItem.tsx:767 ->>>>>>> upstream/main msgid "Following {0}" msgstr "成功跟隨 {0}" @@ -4481,15 +4143,8 @@ msgstr "忘記了？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "還您一個乾淨的河道" +msgstr "還您一個乾淨的河道<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:54 -msgid "Frequently Posts Unwanted Content" -msgstr "頻繁發布不當內容" - -======= ->>>>>>> upstream/main #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" msgstr "來自" @@ -4590,17 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "為您的個人檔案選擇大頭貼照" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:39 -msgid "Glaring violations of law or terms of service" -msgstr "明顯違反法律或服務條款" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 -msgid "Glorification of violence" -msgstr "美化暴力" ->>>>>>> upstream/main +msgstr "為您的個人檔案選擇大頭貼照<<<<<<< HEAD" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4711,18 +4356,7 @@ msgstr "敏感/寫實媒體" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:138 msgid "Graphic violent content" -<<<<<<< HEAD -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 -msgid "Grooming or predatory behavior" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 -msgid "Hacking or system attacks" msgstr "" -======= -msgstr "露骨暴力內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:169 msgid "Grooming or predatory behavior" @@ -4730,8 +4364,7 @@ msgstr "引誘拐騙行為" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "駭客入侵或系統攻擊" ->>>>>>> upstream/main +msgstr "駭客入侵或系統攻擊>>>>>>> upstream/main" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4762,24 +4395,8 @@ msgstr "觸覺" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:34 -msgid "Harassment, trolling, or intolerance" -msgstr "騷擾、惡作劇或歧視行為" -======= -msgstr "騷擾或仇恨" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 -msgid "Harmful or high-risk activities" -msgstr "有害或高風險活動" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:162 -msgid "Harming or endangering minors" -msgstr "傷害或危及未成年人安全" ->>>>>>> upstream/main - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" msgstr "" @@ -4798,11 +4415,7 @@ msgstr "標籤 {tag}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:111 msgid "Hate speech" -<<<<<<< HEAD msgstr "" -======= -msgstr "仇恨言論" ->>>>>>> upstream/main #: src/components/dialogs/EmailDialog/screens/Manage2FA/Disable.tsx:198 #: src/components/dialogs/EmailDialog/screens/Verify.tsx:317 @@ -4811,15 +4424,10 @@ msgstr "已經有代碼了？<0>點一下這裡。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到問題？" +msgstr "遇到問題？<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 -======= -#: src/screens/Settings/Settings.tsx:236 -#: src/screens/Settings/Settings.tsx:240 ->>>>>>> upstream/main #: src/view/shell/desktop/RightNav.tsx:123 #: src/view/shell/desktop/RightNav.tsx:124 #: src/view/shell/Drawer.tsx:381 @@ -4878,23 +4486,14 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隱藏自訂選項" +msgstr "隱藏自訂選項<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:513 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 ->>>>>>> upstream/main msgid "Hide lists" msgstr "" -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:578 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:584 ->>>>>>> upstream/main +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:676 +#: src/components/PostControls/PostMenu/PostMenuItems.tsx:682 msgid "Hide post for me" msgstr "為我隱藏貼文" @@ -5014,11 +4613,7 @@ msgstr "我們該如何開啟這個連結？" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:150 msgid "Human trafficking" -<<<<<<< HEAD msgstr "" -======= -msgstr "人口販賣" ->>>>>>> upstream/main #: src/screens/Settings/components/DisableEmail2FADialog.tsx:133 #: src/screens/Settings/components/DisableEmail2FADialog.tsx:136 @@ -5082,17 +4677,9 @@ msgstr "如果您是開發人員，也可以架設自己的伺服器。" #: src/screens/Settings/components/DeactivateAccountDialog.tsx:92 msgid "If you're trying to change your handle or email, do so before you deactivate." -msgstr "在停用帳號前，記得確認您是否需要變更帳號代碼或電子信箱。" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:38 -msgid "Illegal and Urgent" -msgstr "違法" +msgstr "在停用帳號前，記得確認您是否需要變更帳號代碼或電子信箱。<<<<<<< HEAD" #: src/view/com/util/images/Gallery.tsx:80 -======= -#: src/view/com/util/images/Gallery.tsx:75 ->>>>>>> upstream/main msgid "Image" msgstr "圖片" @@ -5112,29 +4699,15 @@ msgstr "已儲存圖片" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "無法儲存圖片，需要授予存取相簿的權限。" +msgstr "無法儲存圖片，需要授予存取相簿的權限。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:462 msgid "Images will be served as PNG instead of JPEG. Images will take longer to load and use more bandwidth." msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "" - -#: src/lib/moderation/useReportOptions.ts:49 -msgid "Impersonation or false claims about identity or affiliation" -msgstr "冒充/偽造身分或其隸屬關係" - -#: src/lib/moderation/useReportOptions.ts:68 -msgid "Impersonation, misinformation, or false claims" -msgstr "冒充他人、散播錯誤資訊或提出不實指控" -======= -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 -msgid "Impersonation" -msgstr "冒充身分" ->>>>>>> upstream/main +msgstr "冒充身分>>>>>>> upstream/main" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -5162,15 +4735,8 @@ msgstr "應用程式內、推播、所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "應用程式內、推播、您跟隨的人" +msgstr "應用程式內、推播、您跟隨的人<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:91 -msgid "Inappropriate messages or explicit links" -msgstr "低俗言論或敏感內容連結" - -======= ->>>>>>> upstream/main #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 msgid "Inbox zero!" @@ -5198,21 +4764,13 @@ msgstr "輸入密碼以刪除帳號" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "輸入傳送至您電子信箱的代碼" +msgstr "輸入傳送至您電子信箱的代碼<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" msgstr "" -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:49 -======= -#: src/view/com/composer/threadgate/ThreadgateBtn.tsx:130 ->>>>>>> upstream/main -======= #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:135 ->>>>>>> upstream/main msgid "Interaction limited" msgstr "已限制互動" @@ -5286,7 +4844,7 @@ msgstr "現在新手包裡只有 <0>{0}！使用上面的搜尋功能，將 msgid "It's just you right now! Add more people to your starter pack by searching above." msgstr "現在新手包裡只有您一個人！使用上面的搜尋功能，將更多人新增到您的新手包中。" -#: src/view/com/composer/Composer.tsx:1829 +#: src/view/com/composer/Composer.tsx:1830 msgid "Job ID: {0}" msgstr "作業 ID：{0}" @@ -5329,17 +4887,13 @@ msgstr "由 {0} 標記。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "由發布者標記。" +msgstr "由發布者標記。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" msgstr "" -#: src/view/com/composer/labels/LabelsBtn.tsx:75 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:69 ->>>>>>> upstream/main #: src/view/screens/Profile.tsx:223 msgid "Labels" msgstr "標記" @@ -5404,17 +4958,9 @@ msgstr "瞭解詳情" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "深入瞭解年齡驗證" - -<<<<<<< HEAD -#: src/view/com/auth/server-input/index.tsx:218 -======= -#: src/view/com/auth/SplashScreen.web.tsx:172 -msgid "Learn more about Bluesky" -msgstr "深入瞭解 Bluesky" +msgstr "深入瞭解年齡驗證<<<<<<< HEAD" #: src/components/dialogs/ServerInput.tsx:223 ->>>>>>> upstream/main msgid "Learn more about self hosting your PDS." msgstr "深入瞭解如何自行架設 PDS。" @@ -5449,15 +4995,10 @@ msgstr "深入瞭解在 Bluesky 上公開的內容。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "在您的<0>帳號設定瞭解詳情。" +msgstr "在您的<0>帳號設定瞭解詳情。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/moderation/ContentHider.tsx:247 -#: src/view/com/auth/server-input/index.tsx:220 -======= #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 ->>>>>>> upstream/main msgid "Learn more." msgstr "瞭解詳情。" @@ -5521,11 +5062,7 @@ msgid "Like" msgstr "喜歡" #. Accessibility label for the like button when the post has not been liked, verb form followed by number of likes and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:284 -======= -#: src/components/PostControls/index.tsx:270 ->>>>>>> upstream/main msgid "Like ({0, plural, one {# like} other {# likes}})" msgstr "喜歡（{0, plural, other {# 個喜歡}}）" @@ -5588,13 +5125,9 @@ msgstr "喜歡您轉發的貼文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "喜歡您轉發貼文的通知" +msgstr "喜歡您轉發貼文的通知<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:470 ->>>>>>> upstream/main msgid "Likes on this post" msgstr "這則貼文的喜歡數" @@ -5898,49 +5431,24 @@ msgstr "訊息選項" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "訊息" +msgstr "訊息<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 -msgid "Minor harassment or bullying" -msgstr "" - -#: src/Navigation.tsx:509 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:101 -msgctxt "Name of app icon variant" -msgid "Midnight" -msgstr "午夜" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" msgstr "輕度騷擾或霸凌" -#: src/Navigation.tsx:500 ->>>>>>> upstream/main +#: src/Navigation.tsx:509 msgid "Miscellaneous notifications" msgstr "其他通知" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:47 -msgid "Misleading Account" -msgstr "誤導性帳號" - -#: src/lib/moderation/useReportOptions.ts:67 -msgid "Misleading Post" -msgstr "誤導性貼文" -======= -msgstr "誤導" ->>>>>>> upstream/main - #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 #: src/screens/Settings/Settings.tsx:189 @@ -6000,15 +5508,10 @@ msgstr "內容管理工具" #: src/components/moderation/ModerationDetailsDialog.tsx:54 #: src/lib/moderation/useModerationCauseDescription.ts:48 msgid "Moderator has chosen to set a general warning on the content." -msgstr "內容管理服務已對該內容標記普通警告。" +msgstr "內容管理服務已對該內容標記普通警告。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/shell/desktop/Feeds.tsx:104 -#: src/view/shell/desktop/Feeds.tsx:114 -======= #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 ->>>>>>> upstream/main msgid "More feeds" msgstr "更多動態源" @@ -6149,18 +5652,8 @@ msgstr "我的動態源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名稱" +msgstr "名稱<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:59 -#: src/lib/moderation/useReportOptions.ts:98 -#: src/lib/moderation/useReportOptions.ts:106 -#: src/lib/moderation/useReportOptions.ts:114 -msgid "Name or Description Violates Community Standards" -msgstr "名稱或簡介違反社群準則" - -======= ->>>>>>> upstream/main #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 msgid "Nature" @@ -6364,16 +5857,11 @@ msgstr "沒有圖片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "目前還沒有喜歡" +msgstr "目前還沒有喜歡<<<<<<< HEAD" -<<<<<<< HEAD -#: src/components/ProfileCard.tsx:496 -#: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 -======= #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 #: src/view/com/notifications/NotificationFeedItem.tsx:787 ->>>>>>> upstream/main msgid "No longer following {0}" msgstr "成功取消跟隨 {0}" @@ -6385,7 +5873,7 @@ msgstr "目前還沒有訊息" msgid "No more doomscrolling junk-filled algorithms. Find feeds that work for you, not against you." msgstr "告別那些充滿垃圾資訊的演算法，找到對您有利而非有害的動態源。" -#: src/view/com/notifications/NotificationFeed.tsx:122 +#: src/view/com/notifications/NotificationFeed.tsx:124 msgid "No notifications yet!" msgstr "目前還沒有通知！" @@ -6439,9 +5927,9 @@ msgstr "找不到結果" msgid "No results found for \"{query}\"" msgstr "找不到符合「{query}」的結果" -#: src/screens/Search/SearchResults.tsx:313 -#: src/screens/Search/SearchResults.tsx:349 -#: src/screens/Search/SearchResults.tsx:394 +#: src/screens/Search/SearchResults.tsx:315 +#: src/screens/Search/SearchResults.tsx:351 +#: src/screens/Search/SearchResults.tsx:396 msgid "No results found for {query}" msgstr "找不到符合 {query} 的結果" @@ -6481,11 +5969,7 @@ msgstr "找不到任何人。試試以其他關鍵字搜尋。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:80 msgid "Non-consensual intimate imagery" -<<<<<<< HEAD msgstr "" -======= -msgstr "非自願的親密影像 (NCII)" ->>>>>>> upstream/main #: src/lib/moderation/useGlobalLabelStrings.ts:42 msgid "Non-sexual Nudity" @@ -6580,15 +6064,8 @@ msgstr "剛剛" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸露" +msgstr "裸露<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:78 -msgid "Nudity or adult content not labeled as such" -msgstr "未貼上這類標記的裸露或色情內容" - -======= ->>>>>>> upstream/main #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 msgid "Off" @@ -6609,11 +6086,7 @@ msgid "OK" msgstr "好的" #: src/screens/Login/PasswordUpdatedForm.tsx:37 -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:710 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:693 ->>>>>>> upstream/main msgid "Okay" msgstr "好的" @@ -6714,7 +6187,7 @@ msgid "Open drawer menu" msgstr "開啟側邊選單" #: src/screens/Messages/components/MessageInput.web.tsx:181 -#: src/view/com/composer/Composer.tsx:1476 +#: src/view/com/composer/Composer.tsx:1477 msgid "Open emoji picker" msgstr "開啟表情符號選擇器" @@ -6814,7 +6287,7 @@ msgstr "開啟編輯器" msgid "Opens device gallery to select up to {MAX_IMAGES, plural, other {# images}}, or a single video or GIF." msgstr "開啟裝置相簿以選擇最多 {MAX_IMAGES, plural, other {# 張圖片}}、1 段影片或 1 張 GIF。" -#: src/view/com/composer/Composer.tsx:1477 +#: src/view/com/composer/Composer.tsx:1478 msgid "Opens emoji picker" msgstr "開啟表情符號選擇器" @@ -6854,15 +6327,10 @@ msgstr "開啟密碼重設表單" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "開啟貼文語言設定" +msgstr "開啟貼文語言設定<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/notifications/NotificationFeedItem.tsx:906 -#: src/view/com/util/UserAvatar.tsx:613 -======= #: src/view/com/notifications/NotificationFeedItem.tsx:1021 -#: src/view/com/util/UserAvatar.tsx:599 ->>>>>>> upstream/main +#: src/view/com/util/UserAvatar.tsx:613 msgid "Opens this profile" msgstr "開啟這個個人檔案" @@ -6896,12 +6364,7 @@ msgstr "OTA 狀態：沒有更新" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:238 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:242 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:27 -#: src/view/com/composer/labels/LabelsBtn.tsx:185 -======= #: src/view/com/composer/labels/LabelsBtn.tsx:180 ->>>>>>> upstream/main msgid "Other" msgstr "其他" @@ -6911,35 +6374,8 @@ msgstr "其他帳號" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:181 msgid "Other child safety issue" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 -msgid "Other dangerous content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:119 -msgid "Other harassing or hateful content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:59 -msgid "Other misleading content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 -msgid "Other network rule-breaking" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:92 -msgid "Other sexual violence content" -msgstr "" - -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 -msgid "Other violent content" -msgstr "" -======= -msgstr "其他兒少安全問題" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:208 msgid "Other dangerous content" msgstr "其他危險內容" @@ -6962,8 +6398,7 @@ msgstr "其他性虐待內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力內容" ->>>>>>> upstream/main +msgstr "其他暴力內容>>>>>>> upstream/main" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -7039,23 +6474,16 @@ msgstr "跟隨 @{0} 的人" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我跟隨的人" +msgstr "我跟隨的人<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:490 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 ->>>>>>> upstream/main msgid "People you follow" msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." msgstr "已被拒絕存取相簿，請進入系統設定中授予權限。" @@ -7312,12 +6740,12 @@ msgctxt "description" msgid "Post" msgstr "貼文" -#: src/view/com/composer/Composer.tsx:1119 +#: src/view/com/composer/Composer.tsx:1120 msgctxt "action" msgid "Post" msgstr "發布" -#: src/view/com/composer/Composer.tsx:1117 +#: src/view/com/composer/Composer.tsx:1118 msgctxt "action" msgid "Post All" msgstr "全部發布" @@ -7340,19 +6768,12 @@ msgstr "成功刪除貼文" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "貼文發布失敗。請檢查您的網路連線，然後再試一次。" +msgstr "貼文發布失敗。請檢查您的網路連線，然後再試一次。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 #: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 -#: src/screens/VideoFeed/index.tsx:534 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:134 -#: src/screens/PostThread/components/ThreadItemPost.tsx:112 -#: src/screens/PostThread/components/ThreadItemTreePost.tsx:108 #: src/screens/VideoFeed/index.tsx:535 ->>>>>>> upstream/main msgid "Post has been deleted" msgstr "貼文已被刪除" @@ -7486,13 +6907,9 @@ msgstr "隱私權政策" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:173 msgid "Privacy violation of a minor" -<<<<<<< HEAD msgstr "" -======= -msgstr "侵犯未成年者隱私" ->>>>>>> upstream/main -#: src/view/com/composer/Composer.tsx:1892 +#: src/view/com/composer/Composer.tsx:1893 msgid "Processing video..." msgstr "正在處理影片……" @@ -7520,13 +6937,10 @@ msgstr "成功更新個人檔案" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -<<<<<<< HEAD -======= -msgstr "宣傳或販賣違法物品或服務" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." ->>>>>>> upstream/main msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 @@ -7542,22 +6956,22 @@ msgid "Public, sharable lists which can be used to drive feeds." msgstr "公開、可分享的列表，也可作為動態源來使用。" #. Accessibility label for button to publish a single post -#: src/view/com/composer/Composer.tsx:1099 +#: src/view/com/composer/Composer.tsx:1100 msgid "Publish post" msgstr "發布貼文" #. Accessibility label for button to publish multiple posts in a thread -#: src/view/com/composer/Composer.tsx:1092 +#: src/view/com/composer/Composer.tsx:1093 msgid "Publish posts" msgstr "發布貼文" #. Accessibility label for button to publish multiple replies in a thread -#: src/view/com/composer/Composer.tsx:1077 +#: src/view/com/composer/Composer.tsx:1078 msgid "Publish replies" msgstr "發布回覆" #. Accessibility label for button to publish a single reply -#: src/view/com/composer/Composer.tsx:1084 +#: src/view/com/composer/Composer.tsx:1085 msgid "Publish reply" msgstr "發布回覆" @@ -7620,13 +7034,9 @@ msgstr "已拒絕引用貼文" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用" +msgstr "引用<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:454 ->>>>>>> upstream/main msgid "Quotes of this post" msgstr "引用這則貼文" @@ -7687,12 +7097,12 @@ msgstr "閱讀 Bluesky 服務條款" msgid "Read the patches and contribute" msgstr "" -#: src/components/WelcomeModal.tsx:144 +#: src/components/WelcomeModal.tsx:146 msgid "Real creatures." msgstr "" -#: src/components/WelcomeModal.tsx:146 -msgid "Real talk. (Meow! Woof?)" +#: src/components/WelcomeModal.tsx:144 +msgid "Real talk." msgstr "" #: src/screens/Takendown.tsx:171 @@ -7783,8 +7193,8 @@ msgstr "復原貼文分離" msgid "Remove Avatar" msgstr "刪除大頭貼照" -#: src/view/com/util/UserBanner.tsx:241 -#: src/view/com/util/UserBanner.tsx:244 +#: src/view/com/util/UserBanner.tsx:196 +#: src/view/com/util/UserBanner.tsx:199 msgid "Remove Banner" msgstr "刪除橫幅" @@ -7958,17 +7368,13 @@ msgstr "已關閉回覆" msgid "Replies to this post are disabled." msgstr "這則貼文的回覆已關閉。" -#: src/view/com/composer/Composer.tsx:1115 +#: src/view/com/composer/Composer.tsx:1116 msgctxt "action" msgid "Reply" msgstr "回覆" #. Accessibility label for the reply button, verb form followed by number of replies and noun form -<<<<<<< HEAD #: src/components/PostControls/index.tsx:232 -======= -#: src/components/PostControls/index.tsx:224 ->>>>>>> upstream/main msgid "Reply ({0, plural, one {# reply} other {# replies}})" msgstr "回覆（{0, plural, other {# 則回覆}}）" @@ -8058,11 +7464,7 @@ msgstr "已提交檢舉" #: src/components/moderation/ReportDialog/copy.ts:45 msgid "Report this conversation" -<<<<<<< HEAD msgstr "" -======= -msgstr "檢舉此對話" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:31 msgid "Report this feed" @@ -8133,13 +7535,9 @@ msgstr "由您轉發" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "轉發" +msgstr "轉發<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:436 ->>>>>>> upstream/main msgid "Reposts of this post" msgstr "轉發這則貼文" @@ -8212,17 +7610,13 @@ msgstr "重設入門引導進度" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重設密碼" +msgstr "重設密碼<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." msgstr "" -#: src/screens/Login/LoginForm.tsx:324 -======= #: src/screens/Login/LoginForm.tsx:337 ->>>>>>> upstream/main msgid "Retries signing in" msgstr "重試登入" @@ -8375,28 +7769,21 @@ msgstr "說句「你好！👋」" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:43 msgid "Scam" -<<<<<<< HEAD msgstr "" -======= -msgstr "詐騙" ->>>>>>> upstream/main #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科學" +msgstr "科學<<<<<<< HEAD" -<<<<<<< HEAD #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "" +msgstr "=======>>>>>>> upstream/main" -======= ->>>>>>> upstream/main #: src/components/InterestTabs.tsx:255 msgid "Scroll left" msgstr "向左捲動" @@ -8441,11 +7828,11 @@ msgstr "搜尋「{interestsDisplayName}」" msgid "Search for \"{interestsDisplayName}\" (active)" msgstr "搜尋「{interestsDisplayName}」（已選取）" -#: src/view/shell/desktop/Search.tsx:131 +#: src/view/shell/desktop/Search.tsx:132 msgid "Search for \"{query}\"" msgstr "搜尋「{query}」" -#: src/screens/Search/components/AutocompleteResults.tsx:45 +#: src/screens/Search/components/AutocompleteResults.tsx:46 msgid "Search for \"{searchText}\"" msgstr "搜尋「{searchText}」" @@ -8470,7 +7857,7 @@ msgid "Search GIFs" msgstr "搜尋 GIF" #: src/screens/Hashtag.tsx:221 -#: src/screens/Search/SearchResults.tsx:255 +#: src/screens/Search/SearchResults.tsx:257 msgid "Search is currently unavailable when logged out" msgstr "未登入狀態無法使用搜尋功能" @@ -8563,11 +7950,7 @@ msgstr "選擇一個顏色" #: src/components/moderation/ReportDialog/index.tsx:359 msgid "Select a reason" -<<<<<<< HEAD msgstr "" -======= -msgstr "選擇一個理由" ->>>>>>> upstream/main #: src/screens/Login/ChooseAccountForm.tsx:77 msgid "Select account" @@ -8704,11 +8087,7 @@ msgstr "不支援選擇多種媒體類型。" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:188 msgid "Self-harm or dangerous behaviors" -<<<<<<< HEAD msgstr "" -======= -msgstr "自殘或其他危險行為" ->>>>>>> upstream/main #: src/components/dms/ChatEmptyPill.tsx:38 msgid "Send a neat website!" @@ -8778,19 +8157,12 @@ msgstr "設定出生日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "設定新密碼" +msgstr "設定新密碼<<<<<<< HEAD<<<<<<< HEAD=======" -<<<<<<< HEAD -<<<<<<< HEAD -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:461 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 ->>>>>>> upstream/main msgid "Set precisely which groups of people can reply to your post" -msgstr "" +msgstr ">>>>>>> upstream/main" ->>>>>>> upstream/main #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" msgstr "設定您的帳號" @@ -8942,10 +8314,6 @@ msgstr "" #: src/screens/ProfileList/components/MoreOptionsMenu.tsx:171 #: src/screens/StarterPack/StarterPackScreen.tsx:613 #: src/screens/StarterPack/StarterPackScreen.tsx:621 -<<<<<<< HEAD -======= -#: src/view/com/profile/ProfileMenu.tsx:251 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:264 #: src/view/com/profile/ProfileMenu.tsx:277 msgid "Share via..." @@ -9032,15 +8400,10 @@ msgstr "顯示回覆" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "顯示回覆為" +msgstr "顯示回覆為<<<<<<< HEAD" -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:594 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:604 ->>>>>>> upstream/main msgid "Show reply for everyone" msgstr "為所有人顯示回覆" @@ -9060,13 +8423,9 @@ msgstr "顯示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "顯示警告，並從動態中排除內容" +msgstr "顯示警告，並從動態中排除內容<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:629 ->>>>>>> upstream/main msgid "Shows information about when this post was created" msgstr "顯示有關此貼文建立時間的資訊" @@ -9087,7 +8446,7 @@ msgstr "顯示內容" #: src/screens/Login/index.tsx:136 #: src/screens/Login/index.tsx:157 #: src/screens/Login/LoginForm.tsx:184 -#: src/screens/Search/SearchResults.tsx:260 +#: src/screens/Search/SearchResults.tsx:262 #: src/view/com/auth/SplashScreen.tsx:81 #: src/view/com/auth/SplashScreen.tsx:89 #: src/view/com/auth/SplashScreen.web.tsx:127 @@ -9294,26 +8653,13 @@ msgid "Source: <0>{sourceName}" msgstr "來源：<0>{sourceName}" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:39 -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:72 -#: src/lib/moderation/useReportOptions.ts:85 -======= ->>>>>>> upstream/main msgid "Spam" msgstr "垃圾訊息" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -<<<<<<< HEAD msgstr "" -#: src/lib/moderation/useReportOptions.ts:55 -msgid "Spam; excessive mentions or replies" -msgstr "垃圾內容、過多的提及或回覆" -======= -msgstr "垃圾內容或其他虛假互動行為" ->>>>>>> upstream/main - #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 #: src/screens/Search/modules/ExploreTrendingTopics.tsx:230 @@ -9467,23 +8813,9 @@ msgstr "為您推薦" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示" +msgstr "性暗示<<<<<<< HEAD" -<<<<<<< HEAD #: src/Navigation.tsx:327 -======= -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:72 -msgctxt "Name of app icon variant" -msgid "Sunrise" -msgstr "日出" - -#: src/screens/Settings/AppIconSettings/useAppIconSets.ts:86 -msgctxt "Name of app icon variant" -msgid "Sunset" -msgstr "日落" - -#: src/Navigation.tsx:326 ->>>>>>> upstream/main #: src/view/screens/Support.tsx:34 #: src/view/screens/Support.tsx:37 msgid "Support" @@ -9555,11 +8887,7 @@ msgstr "輕觸以跳過" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:107 msgid "Targeted harassment" -<<<<<<< HEAD msgstr "" -======= -msgstr "針對性騷擾" ->>>>>>> upstream/main #: src/state/shell/progress-guide.tsx:235 msgid "Task complete - 10 follows!" @@ -9605,18 +8933,8 @@ msgstr "條款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服務條款" - -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:60 -#: src/lib/moderation/useReportOptions.ts:99 -#: src/lib/moderation/useReportOptions.ts:107 -#: src/lib/moderation/useReportOptions.ts:115 -msgid "Terms used violate community standards" -msgstr "所使用的言詞違反了社群準則" - -======= ->>>>>>> upstream/main +msgstr "服務條款<<<<<<< HEAD" + #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" msgstr "文字和標籤" @@ -9665,11 +8983,7 @@ msgid "That's everything!" msgstr "就這些了！" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:332 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:544 -======= -#: src/view/com/profile/ProfileMenu.tsx:483 ->>>>>>> upstream/main msgid "The account will be able to interact with you after unblocking." msgstr "解除封鎖後，該帳號將能夠重新與您進行互動。" @@ -9801,17 +9115,12 @@ msgstr "連線伺服器時發生問題" msgid "There was an issue contacting the server, please check your internet connection and try again." msgstr "連線至伺服器時發生問題，請檢查您的網路連線，然後再試一次。" -#: src/view/com/notifications/NotificationFeed.tsx:130 +#: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "取得通知時發生問題，按這裡重試。" +msgstr "取得通知時發生問題，按這裡重試。<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/Search/Explore.tsx:993 -#: src/view/com/posts/PostFeed.tsx:798 -======= #: src/screens/Search/Explore.tsx:992 -#: src/view/com/posts/PostFeed.tsx:712 ->>>>>>> upstream/main +#: src/view/com/posts/PostFeed.tsx:798 msgid "There was an issue fetching posts. Tap here to try again." msgstr "取得貼文時發生問題，按這裡重試。" @@ -9850,16 +9159,9 @@ msgstr "更新動態源時發生問題，請檢查您的網路連線，然後再 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:105 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:128 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:142 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:149 #: src/view/com/profile/ProfileMenu.tsx:159 #: src/view/com/profile/ProfileMenu.tsx:173 -======= -#: src/view/com/profile/ProfileMenu.tsx:136 -#: src/view/com/profile/ProfileMenu.tsx:146 -#: src/view/com/profile/ProfileMenu.tsx:160 -#: src/view/com/profile/ProfileMenu.tsx:170 ->>>>>>> upstream/main #: src/view/com/profile/ProfileMenu.tsx:183 #: src/view/com/profile/ProfileMenu.tsx:196 #: src/view/com/profile/ProfileMenu.tsx:208 @@ -9887,19 +9189,14 @@ msgstr "應用程式中發生了意外問題。請告訴我們發生了什麼事 #: src/screens/SignupQueued.tsx:130 msgid "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." -msgstr "目前有眾多新用戶湧入 Bluesky！我們會盡快啟用您的帳號。" +msgstr "目前有眾多新用戶湧入 Bluesky！我們會盡快啟用您的帳號。<<<<<<< HEAD<<<<<<< HEAD" -<<<<<<< HEAD -<<<<<<< HEAD -#: src/screens/Settings/DeerSettings.tsx:608 -msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -======= -#: src/components/dialogs/PostInteractionSettingsDialog.tsx:640 -======= #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 ->>>>>>> upstream/main msgid "These are your default settings" ->>>>>>> upstream/main +msgstr "" + +#: src/screens/Settings/DeerSettings.tsx:608 +msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 @@ -10052,13 +9349,9 @@ msgstr "這個列表是空的。" #: src/screens/Profile/ErrorState.tsx:40 msgid "This moderation service is unavailable. See below for more details. If this issue persists, contact us." -msgstr "這項內容管理服務目前無法使用，更多資訊請參見下方。如果問題持續發生，請聯絡我們。" +msgstr "這項內容管理服務目前無法使用，更多資訊請參見下方。如果問題持續發生，請聯絡我們。<<<<<<< HEAD" -<<<<<<< HEAD #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 -======= -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:669 ->>>>>>> upstream/main msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." msgstr "這則貼文宣告的發布時間為 <0>{0}，但首次出現在 Bluesky 的時間是 <1>{1}。" @@ -10176,11 +9469,7 @@ msgstr "討論串選項" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:134 msgid "Threats or incitement" -<<<<<<< HEAD msgstr "" -======= -msgstr "威脅或煽動暴力" ->>>>>>> upstream/main #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/TimeIndicator.tsx:34 msgid "Time remaining: {0, plural, one {# second} other {# seconds}}" @@ -10230,17 +9519,10 @@ msgstr "話題" #: src/components/dms/MessageContextMenu.tsx:139 #: src/components/dms/MessageContextMenu.tsx:141 -<<<<<<< HEAD #: src/components/PostControls/PostMenu/PostMenuItems.tsx:574 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:576 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:608 #: src/screens/PostThread/components/ThreadItemAnchor.tsx:611 -======= -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:476 -#: src/components/PostControls/PostMenu/PostMenuItems.tsx:478 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:591 -#: src/screens/PostThread/components/ThreadItemAnchor.tsx:594 ->>>>>>> upstream/main msgid "Translate" msgstr "翻譯" @@ -10259,11 +9541,7 @@ msgstr "熱門影片" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:103 msgid "Trolling" -<<<<<<< HEAD msgstr "" -======= -msgstr "引戰" ->>>>>>> upstream/main #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:138 msgid "Trust emerges from relationships, communities, and shared context, so we’re also enabling <0>trusted verifiers: organizations that can directly issue verification." @@ -10366,22 +9644,13 @@ msgstr "解除封鎖" #: src/components/dms/ConvoMenu.tsx:261 #: src/components/dms/ConvoMenu.tsx:264 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:461 #: src/view/com/profile/ProfileMenu.tsx:467 -======= -#: src/view/com/profile/ProfileMenu.tsx:400 -#: src/view/com/profile/ProfileMenu.tsx:406 ->>>>>>> upstream/main msgid "Unblock account" msgstr "解除封鎖帳號" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:330 -<<<<<<< HEAD #: src/view/com/profile/ProfileMenu.tsx:538 -======= -#: src/view/com/profile/ProfileMenu.tsx:477 ->>>>>>> upstream/main msgid "Unblock Account?" msgstr "要解除封鎖嗎？" @@ -10403,16 +9672,8 @@ msgstr "取消轉發" #. Accessibility label for the repost button when the post has been reposted, verb followed by number of reposts and noun #: src/components/PostControls/RepostButton.tsx:67 msgid "Undo repost ({0, plural, one {# repost} other {# reposts}})" -msgstr "取消轉發（{0, plural, other {# 則轉發}}）" +msgstr "取消轉發（{0, plural, other {# 則轉發}}）<<<<<<< HEAD" -<<<<<<< HEAD -#: src/view/com/profile/FollowButton.tsx:63 -msgctxt "action" -msgid "Unfollow" -msgstr "取消跟隨" - -======= ->>>>>>> upstream/main #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" msgstr "取消跟隨 {0}" @@ -10440,32 +9701,18 @@ msgstr "未知的驗證者" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:72 msgid "Unlabeled adult content" -<<<<<<< HEAD msgstr "" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 -msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "" - -#: src/screens/Profile/components/ProfileFeedHeader.tsx:518 -======= -msgstr "未標記的成人內容" - #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" msgstr "未標記、具騷擾性，或非自願的成人內容" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 ->>>>>>> upstream/main msgid "Unlike" msgstr "取消喜歡" #. Accessibility label for the like button when the post has been liked, verb followed by number of likes and noun -<<<<<<< HEAD #: src/components/PostControls/index.tsx:274 -======= -#: src/components/PostControls/index.tsx:260 ->>>>>>> upstream/main msgid "Unlike ({0, plural, one {# like} other {# likes}})" msgstr "取消喜歡（{0, plural, other {# 個喜歡}}）" @@ -10576,16 +9823,8 @@ msgstr "成功取消套用列表" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "不支援的影片類型：{mimeType}" +msgstr "不支援的影片類型：{mimeType}<<<<<<< HEAD" -<<<<<<< HEAD -#: src/lib/moderation/useReportOptions.ts:77 -#: src/lib/moderation/useReportOptions.ts:90 -msgid "Unwanted Sexual Content" -msgstr "不受歡迎的成人內容" - -======= ->>>>>>> upstream/main #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 msgid "Update" @@ -10635,20 +9874,20 @@ msgstr "上傳文字檔案至：" #: src/view/com/util/UserAvatar.tsx:483 #: src/view/com/util/UserAvatar.tsx:486 -#: src/view/com/util/UserBanner.tsx:212 -#: src/view/com/util/UserBanner.tsx:215 +#: src/view/com/util/UserBanner.tsx:167 +#: src/view/com/util/UserBanner.tsx:170 msgid "Upload from Camera" msgstr "從相機上傳" #: src/view/com/util/UserAvatar.tsx:500 -#: src/view/com/util/UserBanner.tsx:229 +#: src/view/com/util/UserBanner.tsx:184 msgid "Upload from Files" msgstr "從檔案上傳" #: src/view/com/util/UserAvatar.tsx:494 #: src/view/com/util/UserAvatar.tsx:498 -#: src/view/com/util/UserBanner.tsx:223 -#: src/view/com/util/UserBanner.tsx:227 +#: src/view/com/util/UserBanner.tsx:178 +#: src/view/com/util/UserBanner.tsx:182 msgid "Upload from Library" msgstr "從相簿上傳" @@ -10661,7 +9900,7 @@ msgstr "正在上傳圖片……" msgid "Uploading link thumbnail..." msgstr "正在上傳連結縮圖……" -#: src/view/com/composer/Composer.tsx:1889 +#: src/view/com/composer/Composer.tsx:1890 msgid "Uploading video..." msgstr "正在上傳影片……" @@ -10915,7 +10154,7 @@ msgstr "找不到影片。" msgid "Video settings" msgstr "影片設定" -#: src/view/com/composer/Composer.tsx:1899 +#: src/view/com/composer/Composer.tsx:1900 msgid "Video uploaded" msgstr "影片上傳成功" @@ -10940,10 +10179,14 @@ msgctxt "Action to view the post the user just created" msgid "View" msgstr "檢視" -#: src/screens/Profile/Header/Shell.tsx:241 +#: src/screens/Profile/Header/Shell.tsx:309 msgid "View {0}'s avatar" msgstr "檢視 {0} 的大頭貼照" +#: src/screens/Profile/Header/Shell.tsx:261 +msgid "View {0}'s banner" +msgstr "" + #: src/components/ProfileCard.tsx:136 #: src/screens/Profile/components/ProfileFeedHeader.tsx:456 #: src/screens/Search/components/SearchProfileCard.tsx:36 @@ -10966,15 +10209,10 @@ msgstr "閱讀部落格文章以瞭解更多資訊" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "檢視偵錯項目" +msgstr "檢視偵錯項目<<<<<<< HEAD" -<<<<<<< HEAD -#: src/screens/VideoFeed/index.tsx:661 -#: src/screens/VideoFeed/index.tsx:679 -======= #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 ->>>>>>> upstream/main msgid "View details" msgstr "檢視詳細資訊" @@ -11010,10 +10248,6 @@ msgstr "檢視貼文" msgid "View profile" msgstr "檢視個人檔案" -#: src/view/com/util/UserBanner.tsx:268 -msgid "View profile banner" -msgstr "" - #: src/view/com/profile/ProfileSubpageHeader.tsx:123 msgid "View the avatar" msgstr "檢視大頭貼照" @@ -11057,15 +10291,10 @@ msgstr "檢視您靜音的帳號" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "檢視您的驗證" - -<<<<<<< HEAD -#: src/view/com/util/images/AutoSizedImage.tsx:212 -#: src/view/com/util/images/AutoSizedImage.tsx:239 -======= -#: src/view/com/util/images/AutoSizedImage.tsx:205 -#: src/view/com/util/images/AutoSizedImage.tsx:232 ->>>>>>> upstream/main +msgstr "檢視您的驗證<<<<<<< HEAD" + +#: src/view/com/util/images/AutoSizedImage.tsx:210 +#: src/view/com/util/images/AutoSizedImage.tsx:237 msgid "Views full image" msgstr "檢視完整圖片" @@ -11075,24 +10304,16 @@ msgstr "進入沉浸模式觀看影片" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:126 msgid "Violence" -<<<<<<< HEAD msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "" +msgstr "暴力或威脅性內容>>>>>>> upstream/main" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "" -======= msgstr "暴力" -#: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 -msgid "Violent or threatening content" -msgstr "暴力或威脅性內容" ->>>>>>> upstream/main - #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 msgid "Visit site" @@ -11242,7 +10463,7 @@ msgstr "很抱歉，我們無法解析此列表。如果問題持續發生，請 msgid "We're sorry, but we weren't able to load your muted words at this time. Please try again." msgstr "很抱歉，我們目前無法載入您的靜音字詞。請稍後再試。" -#: src/screens/Search/SearchResults.tsx:287 +#: src/screens/Search/SearchResults.tsx:289 msgid "We're sorry, but your search could not be completed. Please try again in a few minutes." msgstr "很抱歉，無法完成您的搜尋請求。請稍後再試。" @@ -11343,11 +10564,7 @@ msgstr "為什麼您要申請上訴？" #: src/components/moderation/ReportDialog/copy.ts:46 msgid "Why should this conversation be reviewed?" -<<<<<<< HEAD msgstr "" -======= -msgstr "此對話為何應接受審查？" ->>>>>>> upstream/main #: src/components/moderation/ReportDialog/copy.ts:32 msgid "Why should this feed be reviewed?" @@ -11377,10 +10594,6 @@ msgstr "此用戶為何應接受審查？" msgid "Would you like to block this user and/or delete this conversation?" msgstr "需要封鎖此帳號、刪除整個對話，或兩者一併執行嗎？" -#: src/components/dms/AfterReportDialog.tsx:49 -msgid "Would you like to block this account or delete this conversation?" -msgstr "" - #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 msgid "Write a message" @@ -11813,11 +11026,7 @@ msgstr "您正在使用應用程式專用密碼登入。請改用您的主密碼 #: src/components/moderation/LabelsOnMeDialog.tsx:261 msgid "You've already appealed this label and it's being reviewed by our moderation team." -<<<<<<< HEAD msgstr "" -======= -msgstr "您已對此標記提出過申訴，目前正由我們的內容審查團隊審閱中。" ->>>>>>> upstream/main #: src/components/moderation/ModerationDetailsDialog.tsx:110 #: src/lib/moderation/useModerationCauseDescription.ts:109 -- 2.51.2