diff --git a/src/locale/locales/an/messages.po b/src/locale/locales/an/messages.po index d24469b25..29ae4fdd0 100644 --- a/src/locale/locales/an/messages.po +++ b/src/locale/locales/an/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seguindo} other {seguindo}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publicación} other {publicacions}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accesibilidat" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Achustes d'accesibilidat<<<<<<< HEAD" +msgstr "Achustes d'accesibilidat" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Achustes d'accesibilidat<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta<<<<<<< HEAD" +msgstr "Cuenta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Cuenta silenciada per lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcions de cuenta<<<<<<< HEAD" +msgstr "Opcions de cuenta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Claus d'aplicación" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelar esta decisión" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Aplicar canals recomendadas predeterminadas" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversario<<<<<<< HEAD" +msgstr "Aniversario" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blocar cuentas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocar y borrar<<<<<<< HEAD" +msgstr "Blocar y borrar" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blocar usuario" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocar usuario<<<<<<< HEAD" +msgstr "Blocar usuario" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Cancelar la reactivación y zarrar la sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar busqueda<<<<<<< HEAD" +msgstr "Cancelar busqueda" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Copiar DID de l'autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar codigo<<<<<<< HEAD" +msgstr "Copiar codigo" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizau" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desactivar la retroalimentación haptica" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Descargar fichero CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Toz" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Rematar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Exercicio<<<<<<< HEAD=======" +msgstr "Exercicio" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo<<<<<<< HEAD" +msgstr "Seguindo" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "La has olbidada?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Da-le una cara a lo tuyo perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tiens problemas?<<<<<<< HEAD" +msgstr "Tiens problemas?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si yes mirando de cambiar lo tuyo identificador u correu electronico, fe-lo antes de desactivar la tuya cuenta." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Escribe lo codigo que se t'ha ninviau per correu electronico" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etiquetado per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetau per l'autor.<<<<<<< HEAD" +msgstr "Etiquetau per l'autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Aprender-ne mas" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaches<<<<<<< HEAD" +msgstr "Mensaches" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Lo moderador ha decidiu d'establir una advertencia cheneral sobre lo conteniu." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Los mías canals" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nombre<<<<<<< HEAD" +msgstr "Nombre" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Encara sini \"me-fa-goyos\"<<<<<<< HEAD" +msgstr "Encara sini \"me-fa-goyos\"" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudez<<<<<<< HEAD" +msgstr "Desnudez" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Ubre lo formulario de restablimiento de clau" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "No s'ha puesto cargar la publicación. Compreba la connexión a internet y torna-lo a intentar." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Perfil actualizau" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas<<<<<<< HEAD" +msgstr "Citas" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Tornau a publicar per tu" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Restablir l'estau d'incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablir clau<<<<<<< HEAD" +msgstr "Restablir clau" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia<<<<<<< HEAD" +msgstr "Ciencia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Establir aniversario" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establir la clau nueva<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Establir la clau nueva" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Amostrar respuestas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amostrar las respuestas como<<<<<<< HEAD" +msgstr "Amostrar las respuestas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Amostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Amostrar advertencia y filtrar d'as canals<<<<<<< HEAD" +msgstr "Amostrar advertencia y filtrar d'as canals" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Vasuera" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Sucheriu pa tu" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suchestivo<<<<<<< HEAD" +msgstr "Suchestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Condicions" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Condicions de servicio<<<<<<< HEAD" +msgstr "Condicions de servicio" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "I ha habiu un problema en contactar con o servidor, compreba la tuya con #: 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.<<<<<<< HEAD" +msgstr "I ha habiu un problema en obtener las notificacions. Toca aquí pa intentar de nuevo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "I hai habiu una tongada de nuevos usuarios en Bluesky! Activaremos la tuya cuenta malas que podamos." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Este servicio de moderación no ye disponible. Consulta mas detalles contino. Si lo problema persiste, contacta-nos." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Desfer la republicación ({0, plural, one {# republicación} other {# republicaciones}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Dau de baixa d'a lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Veyer dentrada de depuración" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Veyer las tuyas cuentas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/ast/messages.po b/src/locale/locales/ast/messages.po index dfed53377..7702c3702 100644 --- a/src/locale/locales/ast/messages.po +++ b/src/locale/locales/ast/messages.po @@ -98,7 +98,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publicación} other {publicaciones}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accesibilidá" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Configuración d'accesibilidá<<<<<<< HEAD" +msgstr "Configuración d'accesibilidá" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Configuración d'accesibilidá<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta<<<<<<< HEAD" +msgstr "Cuenta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Contraseñes d'aplicación" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Apellar esta decisión<<<<<<< HEAD" +msgstr "Apellar esta decisión" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversariu<<<<<<< HEAD" +msgstr "Aniversariu" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquiar les cuentes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Llibros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar el códigu<<<<<<< HEAD" +msgstr "Copiar el códigu" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizáu" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Desactivar la rempuesta háptica<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desactivar la rempuesta háptica" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Baxar el ficheru CAR<<<<<<< HEAD" +msgstr "Baxar el ficheru CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Tol mundu" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "<<<<<<< HEAD=======" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Siguiendo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Siguiendo<<<<<<< HEAD" +msgstr "Siguiendo" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "¿Escaeciéstila?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Pon cara al perfil<<<<<<< HEAD" +msgstr "Pon cara al perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Función háptica" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "¿Tienes dalgún problema?<<<<<<< HEAD" +msgstr "¿Tienes dalgún problema?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si tentes de camudar l'identificador o la direición de corréu, failo enantes de desactivar la cuenta." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaxes<<<<<<< HEAD" +msgstr "Mensaxes" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Los mios feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome<<<<<<< HEAD" +msgstr "Nome" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Nun hai nengún préstame" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudos<<<<<<< HEAD" +msgstr "Desnudos" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "La xuba de la publicación falló. Comprueba la conexón a internet y volvi tentalo." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Anovóse'l perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Desactiváronse les cites" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Cites<<<<<<< HEAD" +msgstr "Cites" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republiquesti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia<<<<<<< HEAD" +msgstr "Ciencia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Amosar les rempuestes" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amosar les rempuestes como<<<<<<< HEAD" +msgstr "Amosar les rempuestes como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Suxerencies pa ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suxerente<<<<<<< HEAD" +msgstr "Suxerente" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ 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" +msgstr "Términos del serviciu" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Hebo un problema al conectase col sirvidor. Comprueba la conexón a inte #: 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.<<<<<<< HEAD" +msgstr "Hebo un problema al catar los avisos. Toca equí pa volver tentalo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "¡Hebo una cantidá escomanada d'usuarios nuevos en Bluesky! Vamos activar la cuenta namás que podamos." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Esti serviciu de moderación nun ta disponible. Consulta abaxo los detalles y si sigue'l problema, ponte en contautu con nós." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Diéstite de baxa d'esta llista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Ver la entrada de depuración" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/ca/messages.po b/src/locale/locales/ca/messages.po index 089afba0a..53655333f 100644 --- a/src/locale/locales/ca/messages.po +++ b/src/locale/locales/ca/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seguint} other {seguint}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publicació} other {publicacions}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accessibilitat" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Configuració d'accessibilitat<<<<<<< HEAD" +msgstr "Configuració d'accessibilitat" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Configuració d'accessibilitat<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Compte<<<<<<< HEAD" +msgstr "Compte" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Compte silenciat per una llista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcions del compte<<<<<<< HEAD" +msgstr "Opcions del compte" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Benestar animal>>>>>>> upstream/main" +msgstr "Benestar animal" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Comunicat" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunciant la verificació a Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Anunciant la verificació a Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Qualsevol>>>>>>> upstream/main" +msgstr "Qualsevol" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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ó<<<<<<< HEAD" +msgstr "Contrasenyes de l'aplicació" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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ó<<<<<<< HEAD" +msgstr "Apel·la aquesta decisió" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Aplica la petició d'integració Pull Request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "Almenys 8 caràcters" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Usuari prohibit que torna>>>>>>> upstream/main" +msgstr "Usuari prohibit que torna" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Aniversari" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloqueja comptes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloqueja i elimina<<<<<<< HEAD" +msgstr "Bloqueja i elimina" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloqueja l'usuari" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloqueja l'usuari<<<<<<< HEAD" +msgstr "Bloqueja l'usuari" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Cancel·la la reactivació i surt" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancel·la la cerca<<<<<<< HEAD" +msgstr "Cancel·la la cerca" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Copia el codi" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalitzat" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opcions de personalització<<<<<<< HEAD" +msgstr "Opcions de personalització" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desactiva la retroalimentació hàptica" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Desactiva del tot les respostes>>>>>>> upstream/main" +msgstr "Desactiva del tot les respostes" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Descarrega el fitxer CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ 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" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Tothom" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tota la resta<<<<<<< HEAD" +msgstr "Tota la resta" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Finalitza" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Exercici<<<<<<< HEAD=======" +msgstr "Exercici" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seguint" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguint<<<<<<< HEAD" +msgstr "Seguint" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Oblidada?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Allibera el teu canal<<<<<<< HEAD" +msgstr "Allibera el teu canal" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Posa una cara al teu perfil<<<<<<< HEAD" +msgstr "Posa una cara al teu perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Tens un codi?<0>Clica aquí." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tens problemes?<<<<<<< HEAD" +msgstr "Tens problemes?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Amaga les opcions de personalització<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Amaga les opcions de personalització" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si vols canviar el teu identificador o el correu fes-ho abans de desactivar el compte." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Les imatges no es poden desar si no es concedeix permís per a accedir a la biblioteca de fotos." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Suplantació d'identitat>>>>>>> upstream/main" +msgstr "Suplantació d'identitat" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "Integrades a l'aplicació, push, gent a qui segueixes" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Introdueix el codi que has rebut per correu" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etiquetat per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetat per l'autor.<<<<<<< HEAD" +msgstr "Etiquetat per l'autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "Més informació sobre la garantia d'edat" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Més informació a la <0>configuració del compte." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Notificacions de m'agrades de les teves republicacions" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Opcions del missatge" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Missatges<<<<<<< HEAD" +msgstr "Missatges" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "El moderador ha decidit establir un advertiment general sobre el contingut." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Els meus canals" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nom<<<<<<< HEAD" +msgstr "Nom" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Encara no té cap m'agrada" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Ara" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuesa<<<<<<< HEAD" +msgstr "Nuesa" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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ó<<<<<<< HEAD" +msgstr "Obre la configuració d'idioma de la publicació" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Gent que segueixo" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Persones que segueixes" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Persones que menciones>>>>>>> upstream/main" +msgstr "Persones que menciones" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "No s'ha pogut penjar la publicació. Comprova la tevaa connexió a Internet i torna-ho a provar." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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ó." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "S'han deshabilitat les citacions" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citacions<<<<<<< HEAD" +msgstr "Citacions" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republicat per tu" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicacions<<<<<<< HEAD" +msgstr "Republicacions" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Restableix l'estat de la incorporació" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restableix la contrasenya<<<<<<< HEAD" +msgstr "Restableix la contrasenya" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciència<<<<<<< HEAD" +msgstr "Ciència" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Estableix la data de naixement" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Estableix una nova contrasenya<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Estableix una nova contrasenya" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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ó>>>>>>> upstream/main" +msgstr "Defineix amb precisió quins grups de persones poden respondre a la teva publicació" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Mostra les respostes" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostra les respostes com a<<<<<<< HEAD" +msgstr "Mostra les respostes com a" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Mostra l'advertiment i filtra-ho dels canals" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Suggeriments per tu" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggerent<<<<<<< HEAD" +msgstr "Suggerent" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Condicions" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Condicions del servei<<<<<<< HEAD" +msgstr "Condicions del servei" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "S'ha produït un problema en contactar amb el servidor, comprova la teva #: 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.<<<<<<< HEAD" +msgstr "Hi ha hagut un problema en obtenir les notificacions. Toca aquí per a tornar-ho a provar." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Hi ha hagut una gran quantitat d'usuaris nous a Bluesky! Activarem el teu compte tan aviat com puguem." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "Aquesta és la teva configuració predeterminada>>>>>>> upstream/main" +msgstr "Aquesta és la teva configuració predeterminada" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Desfés republicacions ({0, plural, one {# republicació} other {# republicacions}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Tipus de vídeo no compatible: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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ó<<<<<<< HEAD" +msgstr "Veure el registre de depuració" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Veure els teus comptes silenciats" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Veure les teves verificacions<<<<<<< HEAD" +msgstr "Veure les teves verificacions" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Contingut violent o amenaçador>>>>>>> upstream/main" +msgstr "Contingut violent o amenaçador" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Per què s'hauria de revisar aquest usuari?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/cy/messages.po b/src/locale/locales/cy/messages.po index 1d917dc35..95653a968 100644 --- a/src/locale/locales/cy/messages.po +++ b/src/locale/locales/cy/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {yn dilyn} other {yn dilyn}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {postiad} other {postiad}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Hygyrchedd" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Gosodiadau Hygyrchedd<<<<<<< HEAD" +msgstr "Gosodiadau Hygyrchedd" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Gosodiadau Hygyrchedd<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cyfrif<<<<<<< HEAD" +msgstr "Cyfrif" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Cyfrif wedi'i Dewi gan y Rhestr" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Dewisiadau cyfrif<<<<<<< HEAD" +msgstr "Dewisiadau cyfrif" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Lles anifeiliaid>>>>>>> upstream/main" +msgstr "Lles anifeiliaid" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +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" +msgstr "Mae dilysu nawr ar gael ar Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Cyfrineiriau apiau" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelio'r penderfyniad hwn" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Gosod Cais Tynnu" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "O leiaf 8 nod" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Penblwydd" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Rhwystro cyfrifon" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Rhwystro a Dileu<<<<<<< HEAD" +msgstr "Rhwystro a Dileu" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Rhwystro defnyddiwr" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Rhwystro'r Defnyddiwr<<<<<<< HEAD" +msgstr "Rhwystro'r Defnyddiwr" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Diddymu'r ailweithredu ac allgofnodi" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Diddymu'r chwilio<<<<<<< HEAD" +msgstr "Diddymu'r chwilio" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Copïo DID awdur" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copïo cod<<<<<<< HEAD" +msgstr "Copïo cod" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Cyfaddas" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Dewisiadau cyfaddasu<<<<<<< HEAD" +msgstr "Dewisiadau cyfaddasu" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Analluogi adborth haptig" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Llwythwch ffeil CAR i lawr" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Docsio>>>>>>> upstream/main" +msgstr "Docsio" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Pawb" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Popeth arall<<<<<<< HEAD" +msgstr "Popeth arall" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Gorffen" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Ffitrwydd<<<<<<< HEAD=======" +msgstr "Ffitrwydd" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Yn Dilyn" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Yn Dilyn<<<<<<< HEAD" +msgstr "Yn Dilyn" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Wedi anghofio?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Ryddhewch eich ffrwd<<<<<<< HEAD" +msgstr "Ryddhewch eich ffrwd" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Rhowch wyneb i'ch proffil<<<<<<< HEAD" +msgstr "Rhowch wyneb i'ch proffil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Oes gennych chi god? <0>Cliciwch yma." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Yn cael trafferth?<<<<<<< HEAD" +msgstr "Yn cael trafferth?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Cuddio dewisiadau cyfaddasu<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Cuddio dewisiadau cyfaddasu" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Os ydych chi'n ceisio newid eich enw dangos neu'ch e-bost, gwnewch hynny cyn i chi ei ei gau." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Does dim modd cadw delweddau oni bai fod caniatâd wedi'i roi i gael mynediad i'ch llyfrgell lluniau." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Personadu>>>>>>> upstream/main" +msgstr "Personadu" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "O fewn yr ap, Gwthio, Pobl rydych yn eu dilyn" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Mewnbynnwch y cod sydd wedi'i e-bostio atoch" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Wedi'i labelu gan {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Wedi'i labelu gan yr awdur.<<<<<<< HEAD" +msgstr "Wedi'i labelu gan yr awdur." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Dysgu Rhagor" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Rhagor o wybodaeth am sicrwydd oed<<<<<<< HEAD" +msgstr "Rhagor o wybodaeth am sicrwydd oed" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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<<<<<<< HEAD" +msgstr "Mae rhagor o wybodaeth yn eich <0>gosodiadau cyfrif" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Hoffi eich ail bostiadau" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Hoffi eich hysbysiadau ail bostio<<<<<<< HEAD" +msgstr "Hoffi eich hysbysiadau ail bostio" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Dewisiadau negeseuon" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Negeseuon<<<<<<< HEAD" +msgstr "Negeseuon" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Mae'r cymedrolwr wedi dewis gosod rhybudd cyffredinol ar y cynnwys." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Fy Ffrydiau" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Enw<<<<<<< HEAD" +msgstr "Enw" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Dim delwedd" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Dim hoffi eto<<<<<<< HEAD" +msgstr "Dim hoffi eto" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nawr" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Noethni<<<<<<< HEAD" +msgstr "Noethni" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Yn agor gosodiadau ieithoedd postiadau" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Pobl rwy'n eu dilyn" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Methodd y postiad a llwytho i fyny. Gwiriwch eich cysylltiad rhyngrwyd a rhowch gynnig arall arni." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -7034,7 +7034,7 @@ msgstr "Analluogwyd postiadau dyfyniad" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Dyfyniadau<<<<<<< HEAD" +msgstr "Dyfyniadau" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ 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<<<<<<< HEAD" +msgstr "Ail bostiadau" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Ailosod cyflwr cyflwyno" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Ailosod cyfrinair<<<<<<< HEAD" +msgstr "Ailosod cyfrinair" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Gwyddoniaeth<<<<<<< HEAD" +msgstr "Gwyddoniaeth" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Gosod dyddiad geni" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Gosod cyfrinair newydd<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Gosod cyfrinair newydd" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Dangos atebion" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Dangos atebion fel<<<<<<< HEAD" +msgstr "Dangos atebion fel" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Dangos rhybudd" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Dangos rhybudd a hidlo o ffrydiau<<<<<<< HEAD" +msgstr "Dangos rhybudd a hidlo o ffrydiau" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Awgrymiadau i chi" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Awgrymiadol<<<<<<< HEAD" +msgstr "Awgrymiadol" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Telerau" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Telerau Gwasanaeth<<<<<<< HEAD" +msgstr "Telerau Gwasanaeth" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Bu anhawster wrth gysylltu â'r gweinydd, gwiriwch eich cysylltiad rhyng #: 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.<<<<<<< HEAD" +msgstr "Bu anhawster wrth geisio cael hysbysiadau. Tapiwch yma i geisio eto." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Mae yna ruthr o ddefnyddwyr newydd wedi bod i Bluesky! Byddwn yn agor eich cyfrif cyn gynted ag y gallwn." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Dyw'r gwasanaeth cymedroli hwn ddim ar gael. Gweler isod am ragor o fanylion. Os bydd y mater hwn yn parhau, cysylltwch â ni." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Dad-wneud ail-bostio ({0, plural, one {# ail-bostio} other {# ail-bostio}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Math o fideo sydd ddim yn cael ei gynnal: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Gweld cofnod blog am fwy o fanylion" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Gweld cofnod dadfygio<<<<<<< HEAD" +msgstr "Gweld cofnod dadfygio" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Gweld eich cyfrifon wedi tewi" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Gweld eich dilysiadau<<<<<<< HEAD" +msgstr "Gweld eich dilysiadau" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Cynnwys treisiol neu fygythiol>>>>>>> upstream/main" +msgstr "Cynnwys treisiol neu fygythiol" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Pam dylai'r defnyddiwr hwn gael ei adolygu?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/da/messages.po b/src/locale/locales/da/messages.po index 4a1e47565..77e5d9b48 100644 --- a/src/locale/locales/da/messages.po +++ b/src/locale/locales/da/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {følger} other {følger}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {opslag} other {opslag}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Tilgængelighed" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tilgængelighedsindstillinger<<<<<<< HEAD" +msgstr "Tilgængelighedsindstillinger" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Tilgængelighedsindstillinger<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto<<<<<<< HEAD" +msgstr "Konto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Konto skjult af liste" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontoindstillinger<<<<<<< HEAD" +msgstr "Kontoindstillinger" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "Nyhed" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky introducerer verificerede konti<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky introducerer verificerede konti" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Appadgangskoder" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Klag over afgørelse" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Brug anbefalede standardfeeds" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Anvend pull request<<<<<<< HEAD" +msgstr "Anvend pull request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Vælg emne for algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Mindst 8 tegn<<<<<<< HEAD" +msgstr "Mindst 8 tegn" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Fødselsdato" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloker konti" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloker og slet<<<<<<< HEAD" +msgstr "Bloker og slet" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloker bruger" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloker bruger<<<<<<< HEAD" +msgstr "Bloker bruger" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Bøger" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Annuller genaktivering og log ud" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annuller søgning<<<<<<< HEAD" +msgstr "Annuller søgning" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Kopier forfatter-DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopier kode<<<<<<< HEAD" +msgstr "Kopier kode" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Tilpasset" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Tilpasningsindstillinger<<<<<<< HEAD" +msgstr "Tilpasningsindstillinger" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Fejlsøgningspanel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Deaktiver haptisk feedback" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Download CAR-fil" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Alle" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Alt andet<<<<<<< HEAD" +msgstr "Alt andet" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Afslut" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Motion<<<<<<< HEAD=======" +msgstr "Motion" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Følger" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Følger<<<<<<< HEAD" +msgstr "Følger" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Glemt?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Slip dit feed fri<<<<<<< HEAD" +msgstr "Slip dit feed fri" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Sæt ansigt på din profil<<<<<<< HEAD" +msgstr "Sæt ansigt på din profil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptisk feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Har du en kode? <0>Klik her." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Har du problemer?<<<<<<< HEAD" +msgstr "Har du problemer?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Skjul tilpasningsindstillinger<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Skjul tilpasningsindstillinger" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Hvis du vil skifte dit handle eller din e-mail, skal du gøre det, før du deaktiverer kontoen." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Billeder kan ikke gemmes, medmindre du giver adgang til dit fotobibliotek." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "I appen, Push, Personer, du følger" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Indtast den kode, du har modtaget på e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ 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.<<<<<<< HEAD" +msgstr "Mærkat tilføjet af forfatteren." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Læs mere" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Læs mere om alderstjek<<<<<<< HEAD" +msgstr "Læs mere om alderstjek" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Læs mere under <0>kontoindstillinger." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Likes af dine videredelinger" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifikationer ved videredeling af videredelinger<<<<<<< HEAD" +msgstr "Notifikationer ved videredeling af videredelinger" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Beskedindstillinger" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Beskeder<<<<<<< HEAD" +msgstr "Beskeder" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Diverse notifikationer" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderator har besluttet at sætte en generel advarsel på indholdet." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mine feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Navn<<<<<<< HEAD" +msgstr "Navn" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Intet billede" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ingen likes endnu.<<<<<<< HEAD" +msgstr "Ingen likes endnu." #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nøgenhed<<<<<<< HEAD" +msgstr "Nøgenhed" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Åbner opslagets sprogindstillinger" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Personer jeg følger" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Opslag kunne ikke publiceres. Tjek din internetforbindelse og prøv igen." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profil opdateret" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citatopslag ikke tilladt" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citater<<<<<<< HEAD" +msgstr "Citater" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Videredelt af dig" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Videredelinger<<<<<<< HEAD" +msgstr "Videredelinger" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Nulstil velkomsttilstand" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Nulstil adgangskode<<<<<<< HEAD" +msgstr "Nulstil adgangskode" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Videnskab<<<<<<< HEAD" +msgstr "Videnskab" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Angiv fødselsdato" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Angiv ny adgangskode<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Angiv ny adgangskode" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Vis svar" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Vis svar<<<<<<< HEAD" +msgstr "Vis svar" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Vis advarsel" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Vis advarsel og filtrer fra feeds<<<<<<< HEAD" +msgstr "Vis advarsel og filtrer fra feeds" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Seksuelle undertoner" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Tjenestevilkår" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Tjenestevilkår<<<<<<< HEAD" +msgstr "Tjenestevilkår" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Der kunne ikke skabes forbindelse til serveren. Tjek din internetforbind #: 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.<<<<<<< HEAD" +msgstr "Notifikationer kunne ikke indlæses. Tryk her for at prøve igen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Der kommer mange nye brugere til Bluesky for tiden! Vi aktiverer din konto, så snart vi kan." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Denne moderationstjeneste er utilgængelig. Se herunder for flere oplysninger. Kontakt os, hvis dette problem varer ved." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Fortryd deling ({0, plural, one {# deling} other {# delinger}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Abonnement på liste afmeldt" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Ikkeunderstøttet videotype: {mimeType}<<<<<<< HEAD" +msgstr "Ikkeunderstøttet videotype: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Se blogpost for mere information" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Se loghændelse<<<<<<< HEAD" +msgstr "Se loghændelse" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Vis dine skjulte konti" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Se dine verifikationer<<<<<<< HEAD" +msgstr "Se dine verifikationer" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/de/messages.po b/src/locale/locales/de/messages.po index 76ae02f25..873466c67 100644 --- a/src/locale/locales/de/messages.po +++ b/src/locale/locales/de/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {Folge ich} other {Folge ich}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {Post} other {Posts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Barrierefreiheit" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Barrierefreiheitseinstellungen<<<<<<< HEAD" +msgstr "Barrierefreiheitseinstellungen" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Barrierefreiheitseinstellungen<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account<<<<<<< HEAD" +msgstr "Account" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Account durch Liste stummgeschaltet" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Account-Optionen<<<<<<< HEAD" +msgstr "Account-Optionen" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Tierschutz>>>>>>> upstream/main" +msgstr "Tierschutz" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +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" +msgstr "Ankündigung der Verifizierung auf Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "App-Passwörter" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Einspruch gegen diese Entscheidung" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Pull Request anwenden" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "Mindestens 8 Zeichen" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Zurückkehrender gesperrter Nutzer>>>>>>> upstream/main" +msgstr "Zurückkehrender gesperrter Nutzer" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Geburtstag" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Accounts blockieren" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blockieren und löschen<<<<<<< HEAD" +msgstr "Blockieren und löschen" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Nutzer blockieren" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Nutzer blockieren<<<<<<< HEAD" +msgstr "Nutzer blockieren" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Blockieren verhindert nicht, dass Kennzeichnungen zu deinem Account hinzugefügt werden, verhindert aber, dass dieser Account in deinen Threads antworten oder interagieren kann." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Reaktivierung abbrechen und ausloggen" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Suche abbrechen<<<<<<< HEAD" +msgstr "Suche abbrechen" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "DID des Autors kopieren" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiere den Code<<<<<<< HEAD" +msgstr "Kopiere den Code" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Benutzerdefiniert" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Anpassungsoptionen<<<<<<< HEAD" +msgstr "Anpassungsoptionen" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Haptische Rückmeldung deaktivieren" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Antworten vollständig deaktivieren>>>>>>> upstream/main" +msgstr "Antworten vollständig deaktivieren" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "CAR-Datei herunterladen" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Doxxing>>>>>>> upstream/main" +msgstr "Doxxing" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Alle" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Alles andere<<<<<<< HEAD" +msgstr "Alles andere" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Beenden" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Folge ich" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Folge ich<<<<<<< HEAD" +msgstr "Folge ich" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Vergessen?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Befreie deinen Feed<<<<<<< HEAD" +msgstr "Befreie deinen Feed" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Gib deinem Profil ein Gesicht<<<<<<< HEAD" +msgstr "Gib deinem Profil ein Gesicht" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Du hast einen Code? <0>Hier klicken." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Hast du Probleme?<<<<<<< HEAD" +msgstr "Hast du Probleme?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Anpassungsoptionen ausblenden<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Anpassungsoptionen ausblenden" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Falls du versuchst, deinen Handle oder deine E-Mail zu ändern, tu dies, bevor du deinen Account deaktivierst." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Bilder können nur gespeichert werden, wenn der Zugriff auf deine Galerie erlaubt ist." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Identitätsvortäuschung>>>>>>> upstream/main" +msgstr "Identitätsvortäuschung" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "In-App, Push, Personen, denen du folgst" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Gib den Code ein, der dir per E-Mail zugeschickt wurde" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Von {0} gekennzeichnet." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Vom Autor gekennzeichnet.<<<<<<< HEAD" +msgstr "Vom Autor gekennzeichnet." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Mehr erfahren" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Mehr über die Altersverifikation erfahren<<<<<<< HEAD" +msgstr "Mehr über die Altersverifikation erfahren" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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<<<<<<< HEAD" +msgstr "Mehr dazu in deinen <0>Account-Einstellungen" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Mitteilungen über „Gefällt mir“-Angaben zu deinen Reposts" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Nachrichtenoptionen" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Nachrichten<<<<<<< HEAD" +msgstr "Nachrichten" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Der Moderator hat sich entschieden, eine allgemeine Warnung für den Inhalt festzulegen." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Meine Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Name<<<<<<< HEAD" +msgstr "Name" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Noch keine „Gefällt mir“-Angaben" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Jetzt" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nacktheit<<<<<<< HEAD" +msgstr "Nacktheit" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Öffnet die Post-Spracheinstellungen" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Personen, denen ich folge" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Personen, denen du folgst" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Personen, die du erwähnst>>>>>>> upstream/main" +msgstr "Personen, die du erwähnst" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Fehler beim Hochladen des Posts. Bitte prüfe deine Internetverbindung und versuche es erneut." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Zitate deaktiviert" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Zitate<<<<<<< HEAD" +msgstr "Zitate" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Repostet von dir" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts<<<<<<< HEAD" +msgstr "Reposts" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Onboardingstatus zurücksetzen" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Passwort zurücksetzen<<<<<<< HEAD" +msgstr "Passwort zurücksetzen" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wissenschaft<<<<<<< HEAD" +msgstr "Wissenschaft" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Geburtsdatum festlegen" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Neues Passwort festlegen<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Neues Passwort festlegen" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Antworten anzeigen" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Antworten anzeigen als<<<<<<< HEAD" +msgstr "Antworten anzeigen als" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Warnung zeigen" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Warnung anzeigen und aus Feeds filtern<<<<<<< HEAD" +msgstr "Warnung anzeigen und aus Feeds filtern" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Suggestiv" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Bedingungen" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Nutzungsbedingungen<<<<<<< HEAD" +msgstr "Nutzungsbedingungen" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Beim Kontaktieren des Servers ist ein Problem aufgetreten. Bitte überpr #: 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.<<<<<<< HEAD" +msgstr "Beim Abrufen von Mitteilung ist ein Problem aufgetreten. Tippe hier, um es erneut zu versuchen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Es gab einen Ansturm neuer Nutzer auf Bluesky! Wir werden deinen Account so schnell wie möglich aktivieren." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "Das sind deine Standardeinstellungen>>>>>>> upstream/main" +msgstr "Das sind deine Standardeinstellungen" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Dieser Moderationsdienst ist nicht verfügbar. Siehe unten für weitere Details. Wenn das Problem weiterhin besteht, kontaktiere uns." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Repost rückgängig machen ({0, plural, one {# Repost} other {# Reposts}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Von der Liste abgemeldet" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Nicht unterstützter Videotyp: {mimeType}<<<<<<< HEAD" +msgstr "Nicht unterstützter Videotyp: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Blogpost für weitere Details ansehen" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-Eintrag anzeigen<<<<<<< HEAD" +msgstr "Debug-Eintrag anzeigen" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Sieh dir deine stummgeschalteten Accounts an" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Deine Verifizierungen ansehen<<<<<<< HEAD" +msgstr "Deine Verifizierungen ansehen" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Gewalttätige oder bedrohliche Inhalte>>>>>>> upstream/main" +msgstr "Gewalttätige oder bedrohliche Inhalte" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Warum sollte dieser Nutzer überprüft werden?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/el/messages.po b/src/locale/locales/el/messages.po index 72bd8e8c2..54b6a2f52 100644 --- a/src/locale/locales/el/messages.po +++ b/src/locale/locales/el/messages.po @@ -98,7 +98,7 @@ 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 {ακολουθούν}}<<<<<<< HEAD" +msgstr "{0, plural, one {ακολουθεί} other {ακολουθούν}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {Μου αρέσει} other {Μου αρέσει}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {ανάρτηση} other {αναρτήσεις}}<<<<<<< HEAD" +msgstr "{0, plural, one {ανάρτηση} other {αναρτήσεις}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Προσβασιμότητα" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ρυθμίσεις Προσβασιμότητας<<<<<<< HEAD" +msgstr "Ρυθμίσεις Προσβασιμότητας" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Ρυθμίσεις Προσβασιμότητας<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Λογαριασμός<<<<<<< HEAD" +msgstr "Λογαριασμός" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Λογαριασμός σε σίγαση από λίστα" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Επιλογές λογαριασμού<<<<<<< HEAD" +msgstr "Επιλογές λογαριασμού" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "Τα ονόματα κωδικών πρόσβασης εφαρμογής #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Κωδικοί πρόσβασης εφαρμογής<<<<<<< HEAD" +msgstr "Κωδικοί πρόσβασης εφαρμογής" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Εφεση σε αυτήν την απόφαση<<<<<<< HEAD" +msgstr "Εφεση σε αυτήν την απόφαση" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Εφαρμογή προεπιλεγμένων προτεινόμενων #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Ημερομηνία γέννησης<<<<<<< HEAD" +msgstr "Ημερομηνία γέννησης" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Αποκλεισμός λογαριασμών" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Ο αποκλεισμός δεν θα εμποδίσει την εφαρμογή ετικετών στον λογαριασμό σας, αλλά θα σταματήσει αυτόν τον λογαριασμό από το να απαντά στις συζητήσεις σας ή να αλληλεπιδρά μαζί σας." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Βιβλία" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Ακύρωση αναζήτησης<<<<<<< HEAD" +msgstr "Ακύρωση αναζήτησης" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Αντιγραφή κωδικού<<<<<<< HEAD" +msgstr "Αντιγραφή κωδικού" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Προσαρμοσμένο" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Πίνακας Debug" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "Απενεργοποίηση Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Απενεργοποίηση ανάδρασης αφής<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Απενεργοποίηση ανάδρασης αφής" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "Κατεβάστε το Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Κατεβάστε το αρχείο CAR<<<<<<< HEAD" +msgstr "Κατεβάστε το αρχείο CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Όλοι" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Τέλος" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Φυσική κατάσταση<<<<<<< HEAD=======" +msgstr "Φυσική κατάσταση" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Ακολουθείτε" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Ακολουθείτε<<<<<<< HEAD" +msgstr "Ακολουθείτε" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Ξεχάσατε;" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Δώστε στο προφίλ σας ένα πρόσωπο<<<<<<< HEAD" +msgstr "Δώστε στο προφίλ σας ένα πρόσωπο" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Απτικές αντιδράσεις" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Έχετε πρόβλημα;<<<<<<< HEAD" +msgstr "Έχετε πρόβλημα;" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Εάν προσπαθείτε να αλλάξετε το όνομα χρήστη ή το email σας, κάντε το πριν απενεργοποιήσετε τον λογαριασμό σας." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "Εισαγάγετε τον κωδικό πρόσβασης για δι #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Εισαγάγετε τον κωδικό που σας στάλθηκε μέσω email<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Εισαγάγετε τον κωδικό που σας στάλθηκε μέσω email" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Επισημασμένο από {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Επισημασμένο από τον/την συγγραφέα.<<<<<<< HEAD" +msgstr "Επισημασμένο από τον/την συγγραφέα." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Μάθετε περισσότερα" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Μάθετε περισσότερα για το τι είναι δημό #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Μηνύματα<<<<<<< HEAD" +msgstr "Μηνύματα" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "Ο/η διαχειριστής επέλεξε να θέσει μια γενική προειδοποίηση στο περιεχόμενο.<<<<<<< HEAD" +msgstr "Ο/η διαχειριστής επέλεξε να θέσει μια γενική προειδοποίηση στο περιεχόμενο." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Οι Ροές μου" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Όνομα<<<<<<< HEAD" +msgstr "Όνομα" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Δεν υπάρχουν ακόμη \"Μου αρέσει\"<<<<<<< HEAD" +msgstr "Δεν υπάρχουν ακόμη \"Μου αρέσει\"" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Τώρα" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Γύμνια<<<<<<< HEAD" +msgstr "Γύμνια" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Ανοίγει τη φόρμα επαναφοράς κωδικού πρ #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "Άτομα που ακολουθούνται από τον/την @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "Η δημοσίευση διαγράφηκε" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Η δημοσίευση απέτυχε να μεταφορτωθεί. Παρακαλώ ελέγξτε τη σύνδεση στο internet και προσπαθήστε ξανά.<<<<<<< HEAD" +msgstr "Η δημοσίευση απέτυχε να μεταφορτωθεί. Παρακαλώ ελέγξτε τη σύνδεση στο internet και προσπαθήστε ξανά." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Προφίλ ενημερωμένο" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Οι παραθέσεις δημοσιεύσεων είναι απενε #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Παραθέσεις<<<<<<< HEAD" +msgstr "Παραθέσεις" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Αναδημοσίευση από εσάς" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Επαναφορά κωδικού πρόσβασης<<<<<<< HEAD" +msgstr "Επαναφορά κωδικού πρόσβασης" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Επιστήμη<<<<<<< HEAD" +msgstr "Επιστήμη" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Ορισμός ημερομηνίας γέννησης" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ορισμός νέου κωδικού πρόσβασης<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Ορισμός νέου κωδικού πρόσβασης" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Εμφάνιση απαντήσεων" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Εμφάνιση προειδοποίησης" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Εμφάνιση προειδοποίησης και φιλτράρισμα από τις ροές<<<<<<< HEAD" +msgstr "Εμφάνιση προειδοποίησης και φιλτράρισμα από τις ροές" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Προτεινόμενα για εσάς" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Προκλητικό<<<<<<< HEAD" +msgstr "Προκλητικό" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Όροι" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Όροι Χρήσης<<<<<<< HEAD" +msgstr "Όροι Χρήσης" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Παρουσιάστηκε πρόβλημα επικοινωνίας μ #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Παρουσιάστηκε πρόβλημα λήψης ειδοποιήσεων. Πατήστε εδώ για να δοκιμάσετε ξανά.<<<<<<< HEAD" +msgstr "Παρουσιάστηκε πρόβλημα λήψης ειδοποιήσεων. Πατήστε εδώ για να δοκιμάσετε ξανά." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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! Θα ενεργοποιήσουμε τον λογαριασμό σας το συντομότερο δυνατόν.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Υπήρξε μια έξαρση νέων χρηστών στο Bluesky! Θα ενεργοποιήσουμε τον λογαριασμό σας το συντομότερο δυνατόν." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "Η υπηρεσία διαχείρισης δεν είναι διαθέσιμη. Δείτε παρακάτω για περισσότερες λεπτομέρειες. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας.<<<<<<< HEAD" +msgstr "Η υπηρεσία διαχείρισης δεν είναι διαθέσιμη. Δείτε παρακάτω για περισσότερες λεπτομέρειες. Εάν το πρόβλημα παραμένει, επικοινωνήστε μαζί μας." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Απεγγραφή από αυτήν την λίστα" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Δείτε την ανάρτηση ιστολογίου για περι #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Προβολή καταχώρησης εντοπισμού σφαλμάτων<<<<<<< HEAD" +msgstr "Προβολή καταχώρησης εντοπισμού σφαλμάτων" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Προβολή των λογαριασμών που έχετε σε σί #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/en-GB/messages.po b/src/locale/locales/en-GB/messages.po index 823afa598..6858f83e4 100644 --- a/src/locale/locales/en-GB/messages.po +++ b/src/locale/locales/en-GB/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {following} other {following}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {post} other {posts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accessibility" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Accessibility Settings<<<<<<< HEAD" +msgstr "Accessibility Settings" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Accessibility Settings<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account<<<<<<< HEAD" +msgstr "Account" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Account Muted by List" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Account options<<<<<<< HEAD" +msgstr "Account options" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Animal welfare>>>>>>> upstream/main" +msgstr "Animal welfare" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Announcement" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Announcing verification on Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Announcing verification on Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Anyone>>>>>>> upstream/main" +msgstr "Anyone" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "App passwords" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Appeal this decision" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Apply Pull Request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Assign topic for algo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "At least 8 characters<<<<<<< HEAD" +msgstr "At least 8 characters" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Banned user returning>>>>>>> upstream/main" +msgstr "Banned user returning" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Birthday" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Block accounts" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Block and Delete<<<<<<< HEAD" +msgstr "Block and Delete" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Block user" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Block User<<<<<<< HEAD" +msgstr "Block User" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Cancel reactivation and sign out" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancel search<<<<<<< HEAD" +msgstr "Cancel search" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Copy author DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copy code<<<<<<< HEAD" +msgstr "Copy code" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Custom" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Customisation options<<<<<<< HEAD" +msgstr "Customisation options" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "Disable Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Disable haptic feedback<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Disable haptic feedback" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Disable replies entirely>>>>>>> upstream/main" +msgstr "Disable replies entirely" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Download CAR file" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Doxxing>>>>>>> upstream/main" +msgstr "Doxxing" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Everyone" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Everything else<<<<<<< HEAD" +msgstr "Everything else" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Finish" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Following" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Following<<<<<<< HEAD" +msgstr "Following" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Forgot?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Free your feed<<<<<<< HEAD" +msgstr "Free your feed" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Give your profile a face<<<<<<< HEAD" +msgstr "Give your profile a face" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Have a code? <0>Click here." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Having trouble?<<<<<<< HEAD" +msgstr "Having trouble?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Hide customisation options<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Hide customisation options" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "If you're trying to change your handle or email, do so before you deactivate." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Images cannot be saved unless permission is granted to access your photo library." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Impersonation>>>>>>> upstream/main" +msgstr "Impersonation" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "In-app, Push, People you follow" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Input the code which has been emailed to you" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Labelled by {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Labelled by the author.<<<<<<< HEAD" +msgstr "Labelled by the author." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Learn More" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Learn more about age assurance<<<<<<< HEAD" +msgstr "Learn more about age assurance" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Learn more in your <0>account settings." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Likes of your reposts" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Likes of your reposts notifications<<<<<<< HEAD" +msgstr "Likes of your reposts notifications" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Message options" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages<<<<<<< HEAD" +msgstr "Messages" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderator has chosen to set a general warning on the content." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "My Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Name<<<<<<< HEAD" +msgstr "Name" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "No image" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "No likes yet<<<<<<< HEAD" +msgstr "No likes yet" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Now" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudity<<<<<<< HEAD" +msgstr "Nudity" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Opens password reset form" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Opens post language settings<<<<<<< HEAD" +msgstr "Opens post language settings" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "People I follow" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "People you follow" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "People you mention>>>>>>> upstream/main" +msgstr "People you mention" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Post failed to upload. Please check your Internet connection and try again." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Quote posts disabled" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Quotes<<<<<<< HEAD" +msgstr "Quotes" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Reposted by you" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts<<<<<<< HEAD" +msgstr "Reposts" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Reset onboarding state" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reset password<<<<<<< HEAD" +msgstr "Reset password" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Science<<<<<<< HEAD" +msgstr "Science" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Set birthdate" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Set new password<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Set new password" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "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" +msgstr "Set precisely which groups of people can reply to your post" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Show replies" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Show replies as<<<<<<< HEAD" +msgstr "Show replies as" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Show warning" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Show warning and filter from feeds<<<<<<< HEAD" +msgstr "Show warning and filter from feeds" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Suggested for you" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestive<<<<<<< HEAD" +msgstr "Suggestive" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Terms" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Terms of Service<<<<<<< HEAD" +msgstr "Terms of Service" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "There was an issue contacting the server, please check your internet con #: 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.<<<<<<< HEAD" +msgstr "There was an issue fetching notifications. Tap here to try again." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "There's been a rush of new users to Bluesky! We'll activate your account as soon as we can." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "These are your default settings>>>>>>> upstream/main" +msgstr "These are your default settings" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "This moderation service is unavailable. See below for more details. If this issue persists, contact us." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Undo repost ({0, plural, one {# repost} other {# reposts}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Unsubscribed from list" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Unsupported video type: {mimeType}<<<<<<< HEAD" +msgstr "Unsupported video type: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "View blogpost for more details" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "View debug entry<<<<<<< HEAD" +msgstr "View debug entry" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "View your muted accounts" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "View your verifications<<<<<<< HEAD" +msgstr "View your verifications" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Violent or threatening content>>>>>>> upstream/main" +msgstr "Violent or threatening content" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Why should this user be reviewed?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po index 75798a128..802401e0a 100644 --- a/src/locale/locales/en/messages.po +++ b/src/locale/locales/en/messages.po @@ -590,7 +590,7 @@ msgstr "" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -629,7 +629,7 @@ msgstr "" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1184,7 +1184,7 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1220,7 +1220,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1462,7 +1462,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1501,7 +1501,7 @@ 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" +msgstr "" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1510,7 +1510,7 @@ msgstr "Bitchsky" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:705 msgid "Bluesky cannot confirm the authenticity of the claimed date." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:217 msgid "Bluesky is an open network where you can choose your hosting provider. If you're a developer, you can host your own server." @@ -1946,7 +1946,7 @@ msgstr "" #: src/components/dialogs/EmailDialog/screens/Verify.tsx:275 msgid "Click here to update your email" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/RichTextTag.tsx:54 msgid "Click to open tag menu for {tag}" @@ -2367,7 +2367,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2594,7 +2594,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2648,7 +2648,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2829,7 +2829,7 @@ msgstr "" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -4138,7 +4138,7 @@ msgstr "" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4481,7 +4481,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4672,7 +4672,7 @@ 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" +msgstr "" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4759,7 +4759,7 @@ msgstr "" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4882,7 +4882,7 @@ msgstr "" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4953,7 +4953,7 @@ msgstr "" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -5442,7 +5442,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -6322,7 +6322,7 @@ msgstr "" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "Opens skeet language settings<<<<<<< HEAD" +msgstr "Opens skeet language settings" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -7605,7 +7605,7 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -9112,7 +9112,7 @@ msgstr "" #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9184,7 +9184,7 @@ 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" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -10286,7 +10286,7 @@ msgstr "" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 diff --git a/src/locale/locales/eo/messages.po b/src/locale/locales/eo/messages.po index c97f115f0..62f0cfa5e 100644 --- a/src/locale/locales/eo/messages.po +++ b/src/locale/locales/eo/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {sekvata} other {sekvataj}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {afiŝo} other {afiŝoj}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Alirebleco" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Alireblecaj agordoj<<<<<<< HEAD" +msgstr "Alireblecaj agordoj" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Alireblecaj agordoj<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto<<<<<<< HEAD" +msgstr "Konto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Konto silentigita de listo" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontaj opcioj<<<<<<< HEAD" +msgstr "Kontaj opcioj" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "Anonco" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anoncas konfirmadon ĉe Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Anoncas konfirmadon ĉe Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Apaj pasvortoj" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelacii pri ĉi tiu decido" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Apliki tirpeton" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Asigni temon por algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Almenaŭ 8 signoj<<<<<<< HEAD" +msgstr "Almenaŭ 8 signoj" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Naskiĝtago" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloki kontojn" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloki kaj forigi<<<<<<< HEAD" +msgstr "Bloki kaj forigi" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloki uzanton" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloki uzanton<<<<<<< HEAD" +msgstr "Bloki uzanton" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Libroj" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Nuligi reaktivigon kaj elsaluti" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Nuligi serĉon<<<<<<< HEAD" +msgstr "Nuligi serĉon" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Kopii kodon" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Propra" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Adaptadaj opcioj<<<<<<< HEAD" +msgstr "Adaptadaj opcioj" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panelo de sencimigo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Malŝalti tuŝ-retrokupladan prikomentadon" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Elŝuti CAR-dosieron" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Ĉiuj" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Ĉio alia<<<<<<< HEAD" +msgstr "Ĉio alia" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Fini" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fizika bontenado<<<<<<< HEAD=======" +msgstr "Fizika bontenado" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Sekvas" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Sekvas<<<<<<< HEAD" +msgstr "Sekvas" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Ĉu vi forgesis?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Liberu vian fluon<<<<<<< HEAD" +msgstr "Liberu vian fluon" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Donu vizaĝon al via profilo<<<<<<< HEAD" +msgstr "Donu vizaĝon al via profilo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Tuŝ-retrokuplado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Ĉu vi havas kodon? <0>Alklaku ĉi tie." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ĉu vi havas problemon?<<<<<<< HEAD" +msgstr "Ĉu vi havas problemon?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Kaŝi adaptadajn opciojn<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Kaŝi adaptadajn opciojn" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Se vi provas ŝanĝi vian identigilon aŭ retpoŝtadreson, faru tion antaŭ ol malaktivigi vian konton." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Bildoj ne povas esti konservitaj sen permeso por aliro al via bildbiblioteko." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Entajpu la kodon senditan al via retpoŝtadreso" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etikedita de {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etikedita de la aŭtoro.<<<<<<< HEAD" +msgstr "Etikedita de la aŭtoro." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Eksciu pli" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Eksciu pli pri garantio pri aĝo<<<<<<< HEAD" +msgstr "Eksciu pli pri garantio pri aĝo" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Eksciu pli en viaj <0>kontaj agordoj." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Ŝatoj de viaj reafiŝoj" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Sciigoj pri ŝatoj de viaj reafiŝoj<<<<<<< HEAD" +msgstr "Sciigoj pri ŝatoj de viaj reafiŝoj" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Opcioj de mesaĝo" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesaĝoj<<<<<<< HEAD" +msgstr "Mesaĝoj" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Sciigoj aliaj" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Kontrolanto decidis starigi ĝeneralan averton pri la enhavo." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Miaj fluoj" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nomo<<<<<<< HEAD" +msgstr "Nomo" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Ankoraŭ ne estas ŝatoj" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nun" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudeco<<<<<<< HEAD" +msgstr "Nudeco" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Malfermi agordojn de afiŝaj lingvoj" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Homoj kiujn mi sekvas" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Malsukcesis ŝargi afiŝon. Bonvolu kontroli vian retkonekton kaj reprovi." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profilo ĝisdatigita" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citafiŝoj malebligitaj" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citaĵoj<<<<<<< HEAD" +msgstr "Citaĵoj" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Reafiŝita de vi" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reafiŝoj<<<<<<< HEAD" +msgstr "Reafiŝoj" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Restarigi staton de la lernilo" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restarigi pasvorton<<<<<<< HEAD" +msgstr "Restarigi pasvorton" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scienco<<<<<<< HEAD" +msgstr "Scienco" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Agordi naskiĝdaton" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Agordi novan pasvorton<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Agordi novan pasvorton" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Montri respondojn" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Montri respondojn<<<<<<< HEAD" +msgstr "Montri respondojn" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Montri averton" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Montri averton kaj elfiltri el fluoj<<<<<<< HEAD" +msgstr "Montri averton kaj elfiltri el fluoj" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Trudaĵo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Proponitaj por vi" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Maldeca<<<<<<< HEAD" +msgstr "Maldeca" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Kondiĉoj" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Uzokondiĉoj<<<<<<< HEAD" +msgstr "Uzokondiĉoj" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Estis problemo konektante servilon, bonvolu kontroli vian interretan kon #: 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.<<<<<<< HEAD" +msgstr "Estis problemo ŝargante sciigojn. Tuŝetu ĉi tie por reprovi." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Estas impeto de novaj uzantoj ĉe Bluesky! Ni aktivigos vian konton kiel eble plej rapide." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Ĉi tiu kontrolservo neatingeblas. Vidu pli da detaloj sube. Se ĉi tiu problemo daŭras, kontaktu nin." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Malfari reafiŝon ({0, plural, one {# reafiŝo} other {# reafiŝoj}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Malabonita de listo" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Nesubtenata videaĵa tipo: {mimeType}<<<<<<< HEAD" +msgstr "Nesubtenata videaĵa tipo: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Vidi blogafiŝon por pli da detaloj" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vidi protokolan eron<<<<<<< HEAD" +msgstr "Vidi protokolan eron" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Vidi viajn silentigitajn kontojn" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vidi viajn konfirmojn<<<<<<< HEAD" +msgstr "Vidi viajn konfirmojn" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/es/messages.po b/src/locale/locales/es/messages.po index a2c3669c2..e13803ac3 100644 --- a/src/locale/locales/es/messages.po +++ b/src/locale/locales/es/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {siguiendo} other {siguiendo}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publicación} other {publicaciones}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accesibilidad" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ajustes de accesibilidad<<<<<<< HEAD" +msgstr "Ajustes de accesibilidad" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Ajustes de accesibilidad<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuenta<<<<<<< HEAD" +msgstr "Cuenta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Cuenta silenciada por una lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opciones de la cuenta<<<<<<< HEAD" +msgstr "Opciones de la cuenta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "La verificación llega a Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "La verificación llega a Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Contraseñas de app" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelar esta decisión" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Aplicar feeds recomendados predeterminados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Asignar un tema para el algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Cumpleaños<<<<<<< HEAD" +msgstr "Cumpleaños" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquear cuentas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear y eliminar<<<<<<< HEAD" +msgstr "Bloquear y eliminar" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloquear usuario" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear usuario<<<<<<< HEAD" +msgstr "Bloquear usuario" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Cancelar la reactivación y cerrar la sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar búsqueda<<<<<<< HEAD" +msgstr "Cancelar búsqueda" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Copiar código" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opciones de personalización<<<<<<< HEAD" +msgstr "Opciones de personalización" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desactivar la retroalimentación háptica" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Descargar archivo CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Finalizar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Siguiendo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Siguiendo<<<<<<< HEAD" +msgstr "Siguiendo" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "¿La olvidaste?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Ponle cara a tu perfil<<<<<<< HEAD" +msgstr "Ponle cara a tu perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "¿Tienes un código? <0>Haz clic aquí." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "¿Tienes problemas?<<<<<<< HEAD" +msgstr "¿Tienes problemas?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar las opciones de personalización<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ocultar las opciones de personalización" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si estás intentando cambiar tu nombre de usuario o correo electrónico, hazlo antes de desactivar tu cuenta." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Introduce el código que se te ha enviado por correo electrónico." #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etiquetado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetado por el autor.<<<<<<< HEAD" +msgstr "Etiquetado por el autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Aprender más" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Opciones del mensaje" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensajes<<<<<<< HEAD" +msgstr "Mensajes" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "El moderador ha decidido establecer una advertencia general sobre el contenido." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mis feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nombre<<<<<<< HEAD" +msgstr "Nombre" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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\"<<<<<<< HEAD" +msgstr "Todavía no tiene \"me gusta\"" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Ahora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Desnudez<<<<<<< HEAD" +msgstr "Desnudez" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Abre el formulario de restablecimiento de contraseña" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Personas a las que sigo" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Error al subir la publicación. Por favor, verifica tu conexión a internet y vuelve a intentarlo." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Perfil actualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas<<<<<<< HEAD" +msgstr "Citas" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republicado por ti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicaciones<<<<<<< HEAD" +msgstr "Republicaciones" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Restablecer el estado de incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablecer contraseña<<<<<<< HEAD" +msgstr "Restablecer contraseña" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia<<<<<<< HEAD" +msgstr "Ciencia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Establecer cumpleaños" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establecer la contraseña nueva<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Establecer la contraseña nueva" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Mostrar respuestas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar las respuestas como<<<<<<< HEAD" +msgstr "Mostrar las respuestas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Mostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar advertencia y filtrar de los feeds<<<<<<< HEAD" +msgstr "Mostrar advertencia y filtrar de los feeds" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Sugerido para ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo<<<<<<< HEAD" +msgstr "Sugestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Condiciones" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Términos de servicio<<<<<<< HEAD" +msgstr "Términos de servicio" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Hubo un problema al contactar con el servidor. Por favor, verifica tu co #: 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.<<<<<<< HEAD" +msgstr "Hubo un problema al obtener las notificaciones. Toca aquí para intentar de nuevo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "¡Ha habido una oleada de nuevos usuarios en Bluesky! Activaremos tu cuenta tan pronto como podamos." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Este servicio de moderación no está disponible. Consulta más detalles a continuación. Si el problema persiste, contáctanos." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Deshacer la republicación ({0, plural, one {# republicación} other {# republicaciones}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Dado de baja de la lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Ver entrada de depuración" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Ver tus cuentas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver tus verificaciones<<<<<<< HEAD" +msgstr "Ver tus verificaciones" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/eu/messages.po b/src/locale/locales/eu/messages.po index ffb864791..058cf3e63 100644 --- a/src/locale/locales/eu/messages.po +++ b/src/locale/locales/eu/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {jarraitzen} other {jarraitzen}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {post} other {post}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Erabilerraztasun" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Erabilerraztasun Doikuntzak<<<<<<< HEAD" +msgstr "Erabilerraztasun Doikuntzak" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Erabilerraztasun Doikuntzak<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Kontua<<<<<<< HEAD" +msgstr "Kontua" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Kontua Mututua Zerrendagatik" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontuaren aukerak<<<<<<< HEAD" +msgstr "Kontuaren aukerak" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Animalien ongizatea>>>>>>> upstream/main" +msgstr "Animalien ongizatea" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Iragarpena" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky-n egiaztapena iragartzen<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky-n egiaztapena iragartzen" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Aplikazio pasahitzak" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelatu erabaki hau" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Aplikatu Tira Eskaera" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Algoritmoari gaia esleitu" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Gutxienez 8 karaktere<<<<<<< HEAD" +msgstr "Gutxienez 8 karaktere" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Debekatutako erabiltzailea itzultzen>>>>>>> upstream/main" +msgstr "Debekatutako erabiltzailea itzultzen" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ msgstr "Bete beheko eremuak adinaren berme prozesua hasteko." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Urtebetetzea<<<<<<< HEAD" +msgstr "Urtebetetzea" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Kontuak blokeatu" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokeatu eta Ezabatu<<<<<<< HEAD" +msgstr "Blokeatu eta Ezabatu" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blokeatu erabiltzailea" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blokeatu Erabiltzailea<<<<<<< HEAD" +msgstr "Blokeatu Erabiltzailea" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Blokeatzeak ez du eragotziko etiketak zure kontuan aplikatzea, baina kontu honek zure harietan erantzutea edo zurekin elkarreragitea eragotziko du." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Utzi berriro aktibatzea eta amaitu saioa" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Utzi bilaketa<<<<<<< HEAD" +msgstr "Utzi bilaketa" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Kopiatu egilearen DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiatu kodea<<<<<<< HEAD" +msgstr "Kopiatu kodea" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Pertsonalizatua" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Pertsonalizazio-aukerak<<<<<<< HEAD" +msgstr "Pertsonalizazio-aukerak" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desgaitu feedback haptikoa" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Deskargatu CAR fitxategia" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Doxxing-a>>>>>>> upstream/main" +msgstr "Doxxing-a" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Edonork" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Beste guztia<<<<<<< HEAD" +msgstr "Beste guztia" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Amaitu" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Sasoia<<<<<<< HEAD=======" +msgstr "Sasoia" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Jarraitzen" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Jarraitzen<<<<<<< HEAD" +msgstr "Jarraitzen" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Ahaztuta?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Askatu zure feeda<<<<<<< HEAD" +msgstr "Askatu zure feeda" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Eman aurpegia zure profilari<<<<<<< HEAD" +msgstr "Eman aurpegia zure profilari" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Baduzu koderik? <0>Egin klik hemen." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Arazoak dituzu?<<<<<<< HEAD" +msgstr "Arazoak dituzu?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ezkutatu pertsonalizazio-aukerak<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ezkutatu pertsonalizazio-aukerak" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Zure handle edo posta elektronikoa aldatzen saiatzen ari bazara, egin hori desaktibatu aurretik." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Ezin dira irudiak gorde zure argazki liburutegian sartzeko baimena eman ezean." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Imitazioa>>>>>>> upstream/main" +msgstr "Imitazioa" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "Aplikazioan, Push, Guztiontzat" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "Aplikazioan, Push, Jarraitzen duzun jendea<<<<<<< HEAD" +msgstr "Aplikazioan, Push, Jarraitzen duzun jendea" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Sartu posta elektronikoz bidali zaizun kodea" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0}-k etiketatua." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Egileak etiketatua.<<<<<<< HEAD" +msgstr "Egileak etiketatua." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Gehiago Ikasi" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Adinaren bermeari buruz gehiago ikasi<<<<<<< HEAD" +msgstr "Adinaren bermeari buruz gehiago ikasi" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Informazio gehiago zure <0>kontuaren ezarpenetan." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Zure berposten gustokoak" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Zure berpost jakinarazpenen gustokoak<<<<<<< HEAD" +msgstr "Zure berpost jakinarazpenen gustokoak" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Mezuaren aukerak" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mezuak<<<<<<< HEAD" +msgstr "Mezuak" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderatzaileak edukiari buruzko abisu orokor bat ezartzea aukeratu du." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Nire Feedak" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Izena<<<<<<< HEAD" +msgstr "Izena" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Ez dago gogokorik oraindik" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Orain" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Biluztasuna<<<<<<< HEAD" +msgstr "Biluztasuna" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Postaren hizkuntza ezarpenak irekitzen ditu" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Jarraitzen ditudan pertsonak" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Ezin izan da posta kargatu. Egiaztatu Interneteko konexioa eta saiatu berriro." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -7034,7 +7034,7 @@ msgstr "Post aipamenak desgaituta daude" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Aipamenak<<<<<<< HEAD" +msgstr "Aipamenak" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Zuk berpostatua" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Berpostak<<<<<<< HEAD" +msgstr "Berpostak" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Berrezarri sartze-egoera" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Berrezarri pasahitza<<<<<<< HEAD" +msgstr "Berrezarri pasahitza" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Zientzia<<<<<<< HEAD" +msgstr "Zientzia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Ezarri jaiotze-data" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ezarri pasahitz berria<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Ezarri pasahitz berria" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Erakutsi erantzunak" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Erakutsi erantzunak honela<<<<<<< HEAD" +msgstr "Erakutsi erantzunak honela" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Erakutsi abisua" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Erakutsi feedetako abisua eta iragazkia<<<<<<< HEAD" +msgstr "Erakutsi feedetako abisua eta iragazkia" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Zuretzat proposatua" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Lizuna<<<<<<< HEAD" +msgstr "Lizuna" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Baldintzak" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Zerbitzu-Baldintzak<<<<<<< HEAD" +msgstr "Zerbitzu-Baldintzak" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Arazo bat izan da zerbitzariarekin harremanetan jartzeko. Mesedez, egiaz #: 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.<<<<<<< HEAD" +msgstr "Arazo bat izan da jakinarazpenak eskuratzean. Sakatu hemen berriro saiatzeko." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Erabiltzaile berri mordoa izan da Blueskyra! Zure kontua aktibatuko dugu ahal bezain laster." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderazio-zerbitzu hau ez dago erabilgarri. Ikus behean xehetasun gehiagorako. Arazo honek jarraitzen badu, jarri gurekin harremanetan." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Desegin berposta ({0, plural, one {berpost #} other {# berpost}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Zerrendatik harpidetza kenduta" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Bideo mota bateraezina: {mimeType}<<<<<<< HEAD" +msgstr "Bideo mota bateraezina: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Ikusi blogeko argitalpena xehetasun gehiago lortzeko" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ikusi arazketa-sarrera<<<<<<< HEAD" +msgstr "Ikusi arazketa-sarrera" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Ikusi zuk mutututako kontuak" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ikusi zure egiaztapenak<<<<<<< HEAD" +msgstr "Ikusi zure egiaztapenak" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Eduki bortitza edo mehatxagarria>>>>>>> upstream/main" +msgstr "Eduki bortitza edo mehatxagarria" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Zergatik berrikusi behar da erabiltzaile hau?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/fi/messages.po b/src/locale/locales/fi/messages.po index 413fa469e..99c007f98 100644 --- a/src/locale/locales/fi/messages.po +++ b/src/locale/locales/fi/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seurattu} other {seurattua}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {julkaisu} other {julkaisua}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Saavutettavuus" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Saavutettavuusasetukset<<<<<<< HEAD" +msgstr "Saavutettavuusasetukset" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Saavutettavuusasetukset<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Tili<<<<<<< HEAD" +msgstr "Tili" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Tili mykistetty listan perusteella" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Tilin valinnat<<<<<<< HEAD" +msgstr "Tilin valinnat" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Sovellussalasanat" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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ä<<<<<<< HEAD" +msgstr "Valita tästä päätöksestä" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Käytä oletusarvoisia suositeltuja syötteitä" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Syntymäpäivä<<<<<<< HEAD" +msgstr "Syntymäpäivä" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Estä tilit" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Estäminen ei estä merkintöjen asettamista tilillesi, mutta se estää tätä tiliä vastaamasta ketjuihisi tai olemasta muuten vuorovaikutuksessa kanssasi." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Kirjat" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Peruuta tilin käyttöönpalautus ja kirjaudu ulos" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Peruuta haku<<<<<<< HEAD" +msgstr "Peruuta haku" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopioi koodi<<<<<<< HEAD" +msgstr "Kopioi koodi" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Mukautettu" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Vianetsintäpaneeli" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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ä<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Poista haptinen palaute käytöstä" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Lataa CAR-tiedosto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Kaikilta" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Valmis" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Kuntoilu<<<<<<< HEAD=======" +msgstr "Kuntoilu" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seuratut" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seuratut<<<<<<< HEAD" +msgstr "Seuratut" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Unohditko?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Anna profiilillesi kasvot<<<<<<< HEAD" +msgstr "Anna profiilillesi kasvot" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptiikka" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ongelmia?<<<<<<< HEAD" +msgstr "Ongelmia?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Jos yrität vaihtaa käyttäjätunnuksesi tai sähköpostiosoitteesi, tee se ennen kuin poistat tilin käytöstä." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Syötä sinulle sähköpostitse lähetetty koodi" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Merkinnyt {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Tekijän merkitsemä.<<<<<<< HEAD" +msgstr "Tekijän merkitsemä." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Lue lisää" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Lue lisää siitä, mikä on julkista Blueskyssa." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Viestit<<<<<<< HEAD" +msgstr "Viestit" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderaattori on valinnut asettaa sisällölle yleisen varoituksen." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Syötteeni" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nimi<<<<<<< HEAD" +msgstr "Nimi" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ei vielä tykkäyksiä<<<<<<< HEAD" +msgstr "Ei vielä tykkäyksiä" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nyt" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Alastomuus<<<<<<< HEAD" +msgstr "Alastomuus" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Avaa salasanan palautuslomakkeen" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Julkaisun lataaminen palveluun epäonnistui. Tarkista internetyhteytesi ja yritä uudelleen." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profiili päivitetty" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Lainausjulkaisut poissa käytöstä" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Lainaukset<<<<<<< HEAD" +msgstr "Lainaukset" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Uudelleenjulkaisit" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Nollaa käyttöönoton tila" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Palauta salasana<<<<<<< HEAD" +msgstr "Palauta salasana" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Tiede<<<<<<< HEAD" +msgstr "Tiede" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Aseta syntymäaika" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Aseta uusi salasana<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Aseta uusi salasana" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Näytä vastaukset" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Näytä vastaukset<<<<<<< HEAD" +msgstr "Näytä vastaukset" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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ä<<<<<<< HEAD" +msgstr "Näytä varoitus ja suodata syötteistä" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Roskaposti" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Ehdotuksia sinulle" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Vihjaileva<<<<<<< HEAD" +msgstr "Vihjaileva" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Ehdot" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Käyttöehdot<<<<<<< HEAD" +msgstr "Käyttöehdot" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Yhteydenotossa palvelimeen ilmeni ongelma. Tarkista internetyhteytesi ja #: 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.<<<<<<< HEAD" +msgstr "Ilmoitusten hakemisessa ilmeni ongelma. Napauta tästä yrittääksesi uudelleen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Blueskyyn on tullut paljon uusia käyttäjiä! Aktivoimme tilisi niin pian kuin mahdollista." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Tämä moderointipalvelu ei ole saatavilla. Katso lisätietoja alta. Jos ongelma jatkuu, ota yhteys meihin." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Kumoa uudelleenjulkaisu ({0, plural, one {# uudelleenjulkaisu} other {# uudelleenjulkaisua}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Listan tilaus peruutettu" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Katso blogijulkaisu saadaksesi lisätietoja" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Näytä vianetsintäkirjaus<<<<<<< HEAD" +msgstr "Näytä vianetsintäkirjaus" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Näytä mykistämäsi tilit" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po index 1097084ac..1a7034afa 100644 --- a/src/locale/locales/fr/messages.po +++ b/src/locale/locales/fr/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {abonnement} other {abonnements}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {post} other {posts}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accessibilité" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Paramètres d’accessibilité<<<<<<< HEAD" +msgstr "Paramètres d’accessibilité" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Paramètres d’accessibilité<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Compte<<<<<<< HEAD" +msgstr "Compte" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Compte masqué par liste" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Options de compte<<<<<<< HEAD" +msgstr "Options de compte" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bien-être animal>>>>>>> upstream/main" +msgstr "Bien-être animal" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +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" +msgstr "La vérification arrive sur Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "N’importe qui>>>>>>> upstream/main" +msgstr "N’importe qui" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Mots de passe d’application" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Faire appel de cette décision" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Appliquer la pull request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "Au moins 8 caractères" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Date de naissance" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquer ces comptes" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquer et supprimer<<<<<<< HEAD" +msgstr "Bloquer et supprimer" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloquer le compte" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquer le compte<<<<<<< HEAD" +msgstr "Bloquer le compte" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Annuler la réactivation et se déconnecter" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annuler la recherche<<<<<<< HEAD" +msgstr "Annuler la recherche" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Copier ce code" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personnalisé" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Paramètres de personnalisation<<<<<<< HEAD" +msgstr "Paramètres de personnalisation" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Désactiver le retour haptique" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Désactiver complètement les réponses>>>>>>> upstream/main" +msgstr "Désactiver complètement les réponses" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Télécharger le fichier CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ 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)" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Tout le monde" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Divers<<<<<<< HEAD" +msgstr "Divers" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Terminer" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Suivi" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Suivis<<<<<<< HEAD" +msgstr "Suivis" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Oublié ?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libérez votre fil d’actu<<<<<<< HEAD" +msgstr "Libérez votre fil d’actu" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Donner à votre profil un visage<<<<<<< HEAD" +msgstr "Donner à votre profil un visage" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Vous avez un code ? <0>Cliquez ici." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Un souci ?<<<<<<< HEAD" +msgstr "Un souci ?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Masquer les paramètres de personnalisation<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Masquer les paramètres de personnalisation" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si vous essayez de changer de pseudo ou d’adresse e-mail, faites-le avant de désactiver votre compte." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Les images ne peuvent être enregistrées tant qu’une permission d’accès à votre photothèque n’est pas autorisée." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Usurpation d’identité>>>>>>> upstream/main" +msgstr "Usurpation d’identité" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "Dans l’app., alertes, des comptes suivis" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Entrez le code qui vous a été envoyé par e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Étiqueté par {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Étiqueté par l’auteur·ice.<<<<<<< HEAD" +msgstr "Étiqueté par l’auteur·ice." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "En savoir plus sur la vérification d’âge" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "En savoir plus dans vos <0>paramètres de compte." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "« J’aime » de vos reposts" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifications « J’aime » de vos reposts<<<<<<< HEAD" +msgstr "Notifications « J’aime » de vos reposts" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Options de message" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages<<<<<<< HEAD" +msgstr "Messages" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "La modération a choisi d’ajouter un avertissement général sur le contenu." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mes fils d’actu" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nom<<<<<<< HEAD" +msgstr "Nom" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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 »<<<<<<< HEAD" +msgstr "Pas encore de mentions « j’aime »" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Maintenant" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudité<<<<<<< HEAD" +msgstr "Nudité" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Ouvre les paramètres de langue du post" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Comptes suivis" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Comptes que vous suivez" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Comptes que vous mentionnez>>>>>>> upstream/main" +msgstr "Comptes que vous mentionnez" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Échec de l’envoi du post. Vérifiez votre connexion Internet et réessayez." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citations désactivées" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citations<<<<<<< HEAD" +msgstr "Citations" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republié par vous" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Reposts<<<<<<< HEAD" +msgstr "Reposts" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Réinitialisation du didacticiel" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Réinitialiser mot de passe<<<<<<< HEAD" +msgstr "Réinitialiser mot de passe" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Science<<<<<<< HEAD" +msgstr "Science" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Entrez votre date de naissance" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Définir un nouveau mot de passe<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Définir un nouveau mot de passe" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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>>>>>>> upstream/main" +msgstr "Définissez précisément quels groupes de personnes peuvent répondre à votre post" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Afficher les réponses" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Type d’affichage des réponses<<<<<<< HEAD" +msgstr "Type d’affichage des réponses" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Afficher l’avertissement et filtrer des fils d’actu" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Suggestif" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ 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" +msgstr "Conditions générales" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Il y a eu un problème de connexion au serveur, vérifiez votre connexio #: 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.<<<<<<< HEAD" +msgstr "Il y a eu un problème lors de la récupération des notifications. Appuyez ici pour réessayer." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Il y a eu un afflux de nouveaux personnes sur Bluesky ! Nous activerons ton compte dès que possible." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 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" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Annuler le repost ({0, plural, one {# repost} other {# reposts}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Type de vidéo non pris en charge : {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Afficher l’entrée de débogage" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Consulter vos comptes masqués" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Voir vos vérifications<<<<<<< HEAD" +msgstr "Voir vos vérifications" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Contenu violent ou menaçant>>>>>>> upstream/main" +msgstr "Contenu violent ou menaçant" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Pourquoi ce compte doit-il être examiné ?" #: src/components/dms/AfterReportDialog.tsx:49 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 ?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/fy/messages.po b/src/locale/locales/fy/messages.po index 5e58c0821..96b6bc5c0 100644 --- a/src/locale/locales/fy/messages.po +++ b/src/locale/locales/fy/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {folgjend} other {folgjend}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {berjocht} other {berjochten}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Tagonklikheid" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tagonklikheidsynstellingen<<<<<<< HEAD" +msgstr "Tagonklikheidsynstellingen" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Tagonklikheidsynstellingen<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account<<<<<<< HEAD" +msgstr "Account" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Account negearre troch list" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Accountopsjes<<<<<<< HEAD" +msgstr "Accountopsjes" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "Meidieling" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Oankundiging fan ferifikaasje op Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Oankundiging fan ferifikaasje op Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "App-wachtwurden" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Beswier tsjin dizze beslissing meitsje" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Pull-fersyk tapasse" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Underwerp foar algoritme tawize" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Jierdei" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Accounts blokkearje" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokkearje en fuortsmite<<<<<<< HEAD" +msgstr "Blokkearje en fuortsmite" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Brûker blokkearje" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Brûker blokkearje<<<<<<< HEAD" +msgstr "Brûker blokkearje" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Boeken" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Weraktivearring annulearje en ôfmelde" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Sykopdracht annulearje<<<<<<< HEAD" +msgstr "Sykopdracht annulearje" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Auteur-DID kopiearje" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Koade kopiearje<<<<<<< HEAD" +msgstr "Koade kopiearje" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Oanpast" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Oanpassingsopsjes<<<<<<< HEAD" +msgstr "Oanpassingsopsjes" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Paniel debugge" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Fielbere feedback útskeakelje" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "CAR-bestân downloade" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Elkenien" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Al it oare<<<<<<< HEAD" +msgstr "Al it oare" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Foltôgje" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Folgjend" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Folgjend<<<<<<< HEAD" +msgstr "Folgjend" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Ferjitten?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Jou dyn profyl in gesicht<<<<<<< HEAD" +msgstr "Jou dyn profyl in gesicht" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptyske feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Hasto in koade? <0>Klik hjir." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Hasto problemen?<<<<<<< HEAD" +msgstr "Hasto problemen?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Oanpassingsopsjes ferstoppe<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Oanpassingsopsjes ferstoppe" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Asto dyn handle of e-mailadres probearrest te wizigjen, doch dit dan eardatsto de-aktivearrest." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Ofbyldingen kinne net bewarre wurden, útsein as der tastimming is foar tagong ta dyn fotobiblioteek." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "Yn-app, pushberjocht, minsken dy’tsto folgest" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Fer de koade yn dy’t nei dy e-maild is" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Labele troch {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Labele troch de auteur.<<<<<<< HEAD" +msgstr "Labele troch de auteur." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Mear ynfo" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Mear ynfo oer leeftiidsferifikaasje<<<<<<< HEAD" +msgstr "Mear ynfo oer leeftiidsferifikaasje" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Mear ynformaasje yn dyn <0>accountynstellingen." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Meldingen oer mei-’k-wol-oers fan dyn opnij-pleatsingen" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Berjochtopsjes" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Berjochten<<<<<<< HEAD" +msgstr "Berjochten" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Ferskate meldingen" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "De moderator hat derfoar keazen om in algemiene warskôging yn te stellen foar de ynhâld." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Myn feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Namme<<<<<<< HEAD" +msgstr "Namme" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Noch gjin mei-’k-wol-oers" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "No" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Neakens<<<<<<< HEAD" +msgstr "Neakens" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Minsken dy’t ik folgje" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Berjocht kin net opladen wurde. Kontrolearje dyn ynternetferbining en probearje it opnij." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profyl bywurke" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Sitaatberjochten útskeakele" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Sitaten<<<<<<< HEAD" +msgstr "Sitaten" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Opnij pleatst troch dy" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Opnij-pleatsingen<<<<<<< HEAD" +msgstr "Opnij-pleatsingen" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Yntroduksje-status opnij ynstelle" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Wachtwurd opnij ynstelle<<<<<<< HEAD" +msgstr "Wachtwurd opnij ynstelle" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wittenskip<<<<<<< HEAD" +msgstr "Wittenskip" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Bertedatum ynstelle" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Nij wachtwurd ynstelle<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Nij wachtwurd ynstelle" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Antwurden toane" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Antwurden toane as<<<<<<< HEAD" +msgstr "Antwurden toane as" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Warskôging en filter út feeds toane" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Foarsteld foar dy" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestyf<<<<<<< HEAD" +msgstr "Suggestyf" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Betingsten" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Tsjinstbetingsten<<<<<<< HEAD" +msgstr "Tsjinstbetingsten" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Der is in probleem bard by it ferbinen mei de server. Kontrolearje dyn y #: 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.<<<<<<< HEAD" +msgstr "Der is in probleem bard by it opheljen fan meldingen. Tik hjir om it opnij te probearjen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Der is in grutte oanrin fan nije brûkers nei Bluesky! Wy aktivearje dyn account sa gau as mooglik." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Dizze moderaasjetsjinst is net beskikber. Sjoch hjirûnder foar mear details. Nim kontakt mei ús op as dit probleem bliuwt." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Opnij pleatsen ûngedien meitsje ({0, plural, one {# opnijpleatsing} other {# opnijpleatsingen}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Fan lis ôfmeld" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Blogartikel foar mear details besjen" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-item besjen<<<<<<< HEAD" +msgstr "Debug-item besjen" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Dyn negearre accounts besjen" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Dyn ferifikaasjes besjen<<<<<<< HEAD" +msgstr "Dyn ferifikaasjes besjen" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/ga/messages.po b/src/locale/locales/ga/messages.po index 568067b00..adfe48142 100644 --- a/src/locale/locales/ga/messages.po +++ b/src/locale/locales/ga/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {á leanúint} two {á leanúint} few {á leanúint} many {á leanúint} other {á leanúint}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {moladh} two {mholadh} few {mholadh} many {moladh} other #: 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {phostáil} two {phostáil} few {phostáil} many {bpostáil} other {postáil}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Inrochtaineacht" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Socruithe Inrochtaineachta<<<<<<< HEAD" +msgstr "Socruithe Inrochtaineachta" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Socruithe Inrochtaineachta<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cuntas<<<<<<< HEAD" +msgstr "Cuntas" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Balbhaíodh an Cuntas trí Liosta" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Roghanna cuntais<<<<<<< HEAD" +msgstr "Roghanna cuntais" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Pasfhocail aipe" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Déan achomharc i gcoinne an chinnidh seo" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Breithlá<<<<<<< HEAD" +msgstr "Breithlá" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blocáil na cuntais seo" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocáil agus Scrios<<<<<<< HEAD" +msgstr "Blocáil agus Scrios" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blocáil an t-úsáideoir" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocáil an t-úsáideoir<<<<<<< HEAD" +msgstr "Blocáil an t-úsáideoir" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Leabhair" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cealaigh an cuardach<<<<<<< HEAD" +msgstr "Cealaigh an cuardach" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Cóipeáil an cód<<<<<<< HEAD" +msgstr "Cóipeáil an cód" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Saincheaptha" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Painéal dífhabhtaithe" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ná húsáid aiseolas haptach" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Íoslódáil comhad CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Chuile dhuine" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Críochnaigh" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Folláine<<<<<<< HEAD=======" +msgstr "Folláine" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Á leanúint" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Á leanúint<<<<<<< HEAD" +msgstr "Á leanúint" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Dearmadta?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Tabhair gnúis do do phróifíl" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptaic" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Fadhb ort?<<<<<<< HEAD" +msgstr "Fadhb ort?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Má tá sé i gceist agat do hanla nó ríomhphost a athrú, déan sin sula ndéanann tú díghníomhú." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Cuir isteach an cód a chuir muid chugat i dteachtaireacht r-phoist" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Lipéad curtha ag {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Lipéadaithe ag an údar.<<<<<<< HEAD" +msgstr "Lipéadaithe ag an údar." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Le tuilleadh a fhoghlaim" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Teachtaireachtaí<<<<<<< HEAD" +msgstr "Teachtaireachtaí" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Chuir an modhnóir rabhadh ginearálta ar an ábhar." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mo Chuid Fothaí" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ainm<<<<<<< HEAD" +msgstr "Ainm" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Gan moladh fós<<<<<<< HEAD" +msgstr "Gan moladh fós" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Anois" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Lomnochtacht<<<<<<< HEAD" +msgstr "Lomnochtacht" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Níor uaslódáladh an phostáil. Seiceáil do cheangal leis an idirlíon agus bain triail eile as." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Próifíl uasdátaithe" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ 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<<<<<<< HEAD" +msgstr "Postálacha athluaite" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Athphostáilte agat" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Athshocraigh an próiseas cláraithe" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Athshocraigh an pasfhocal<<<<<<< HEAD" +msgstr "Athshocraigh an pasfhocal" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Eolaíocht<<<<<<< HEAD" +msgstr "Eolaíocht" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Socraigh do bhreithlá" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Socraigh pasfhocal nua<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Socraigh pasfhocal nua" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Taispeáin freagraí" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Taispeáin freagraí mar<<<<<<< HEAD" +msgstr "Taispeáin freagraí mar" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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í é<<<<<<< HEAD" +msgstr "Taispeáin rabhadh agus scag ó na fothaí é" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Turscar" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Gáirsiúil" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ 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" +msgstr "Téarmaí Seirbhíse" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Bhí fadhb ann maidir le teagmháil a dhéanamh leis an bhfreastalaí. S #: 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.<<<<<<< HEAD" +msgstr "Bhí fadhb ann maidir le fógraí a fháil. Tapáil anseo le triail eile a bhaint as." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Tá ráchairt ar Bluesky le déanaí! Cuirfidh muid do chuntas ag obair chomh luath agus is féidir." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +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}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Dhíliostáil tú ón liosta seo" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Féach ar an iontráil dífhabhtaithe" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Féach ar na cuntais a bhalbhaigh tú" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/gd/messages.po b/src/locale/locales/gd/messages.po index 7debf6ecc..befb07991 100644 --- a/src/locale/locales/gd/messages.po +++ b/src/locale/locales/gd/messages.po @@ -98,7 +98,7 @@ 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 #}}<<<<<<< HEAD" +msgstr "{0, plural, one {A’ leantainn #} two {A’ leantainn #} few {A’ leantainn #} other {A’ leantainn #}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {’s toil le # seo} two {’s toil le # seo} few {’s #: 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {phost} two {phost} few {puist} other {post}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "So-ruigsinneachd" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Roghainnean na so-ruigsinneachd<<<<<<< HEAD" +msgstr "Roghainnean na so-ruigsinneachd" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Roghainnean na so-ruigsinneachd<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cunntas<<<<<<< HEAD" +msgstr "Cunntas" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Chaidh an cunntas a mhùchadh le liosta" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Roghainnean a’ chunntais<<<<<<< HEAD" +msgstr "Roghainnean a’ chunntais" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +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" +msgstr "Naidheachd mu dhearbhadh air Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Faclan-faire nan aplacaidean" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Tog ath-thagradh an aghaidh a’ cho-dhùnaidh seo" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Cuir an t-iarrtas pull an gnìomh" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Iomruin cuspair dhan algairim" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Co-dhiù 8 caractaran<<<<<<< HEAD" +msgstr "Co-dhiù 8 caractaran" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Co-là breith" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bac cunntasan" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bac is sguab às<<<<<<< HEAD" +msgstr "Bac is sguab às" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bac an cleachdaiche" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bac an cleachdaiche<<<<<<< HEAD" +msgstr "Bac an cleachdaiche" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Leabhraichean" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Sguir dhen ath-ghnìomhachadh is clàraich a-mach" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Sguir dhen lorg<<<<<<< HEAD" +msgstr "Sguir dhen lorg" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Dèan lethbhreac dhen chòd" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Gnàthaichte" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Roghainnean gnàthachaidh<<<<<<< HEAD" +msgstr "Roghainnean gnàthachaidh" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Leòsan an dì-bhugachaidh" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Cuir an fhreagairt haptaigeach à comas" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Luchdaich a-nuas am faidhle CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ 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<<<<<<< HEAD" +msgstr "A h-uile rud eile" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Crìochnaich" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Ga leantainn" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Ga leantainn<<<<<<< HEAD" +msgstr "Ga leantainn" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ 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" +msgstr "Saor an t-inbhir agad" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Cuir aodann ris a’ phròifil agad" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptaigeachd" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "A bheil còd agad? <0>Briog an-seo." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "A bheil duilgheadasan agad?<<<<<<< HEAD" +msgstr "A bheil duilgheadasan agad?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Falaich gach roghainn gnàthachaidh<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Falaich gach roghainn gnàthachaidh" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Ma tha thu airson an làmhrachan no post-d agad atharrachadh, dèan sin mus tèid e à comas." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Chan urrainn dhut dealbhan a shàbhaladh ach ma thug thu cead-inntrigidh dhuinn do leabhar-lann nan dealbhan agad." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "San aplacaid; push, daoine a tha thu gan leantainn" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Cuir a-steach an còd a chuir sinn thugad air a’ phost-d" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Air a leubaileadh le {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Air a leubaileadh leis an ùghdar.<<<<<<< HEAD" +msgstr "Air a leubaileadh leis an ùghdar." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Barrachd fiosrachaidh" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Barrachd fiosrachadh mu dhearbhadh na h-aoise<<<<<<< HEAD" +msgstr "Barrachd fiosrachadh mu dhearbhadh na h-aoise" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Faigh barrachd fiosrachaidh ann an <0>roghainnean a’ chunntais agad." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Brathan mu dhaoine a dh’innis gur toil leotha rud a dh’ath-phostaich thu" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Roghainnean na teachdaireachd" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Teachdaireachdan<<<<<<< HEAD" +msgstr "Teachdaireachdan" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Brathan eile" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Thagh modaratair rabhadh coitcheann dhan t-susbaint." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Na h-inbhirean agam" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ainm<<<<<<< HEAD" +msgstr "Ainm" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Cha toil le gin seo fhathast" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ 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" +msgstr "Lomnochd" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Fosglaidh seo roghainnean cànan a’ phuist" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Daoine a tha mi gan leantainn" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Chaidh a’ phròifil ùrachadh" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Tha luaidhean air puist à comas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Luaidhean<<<<<<< HEAD" +msgstr "Luaidhean" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Rinn thu ath-phostadh" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Ath-phostadh<<<<<<< HEAD" +msgstr "Ath-phostadh" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Ath-shuidhich staid a’ bhòrdachaidh" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Ath-shuidhich am facal-faire<<<<<<< HEAD" +msgstr "Ath-shuidhich am facal-faire" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Saidheans<<<<<<< HEAD" +msgstr "Saidheans" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Suidhich latha do bhreith" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Suidhich facal-faire ùr<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Suidhich facal-faire ùr" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Seall na freagairtean" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Seall na freagairtean mar<<<<<<< HEAD" +msgstr "Seall na freagairtean mar" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Seall rabhadh is criathraich às na h-inbhirean e" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spama" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Molaidhean dhut" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Leth-fheiseil<<<<<<< HEAD" +msgstr "Leth-fheiseil" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Na teirmichean" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Teirmichean na seirbheise<<<<<<< HEAD" +msgstr "Teirmichean na seirbheise" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Cha b’ urrainn dhuinn conaltradh leis an fhrithealaiche, thoir sùil a #: 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.<<<<<<< HEAD" +msgstr "Cha b’ urrainn dhuinn na brathan fhaighinn dhut. Thoir gnogag airson feuchainn ris a-rithist." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Tha sluagh mòr air ùr-thighinn dha Bluesky! Cuiridh sinn an cunntas agad an gnìomh cho luath ’s a ghabhas." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +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}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ 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" +msgstr "Chan eil taic ri videothan dhen t-seòrsa {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Seall am bloga airson barrachd fiosrachaidh" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Seall an t-innteart dì-bhugachaidh<<<<<<< HEAD" +msgstr "Seall an t-innteart dì-bhugachaidh" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ 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" +msgstr "Seall an dearbhadh a rinn thu" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/gl/messages.po b/src/locale/locales/gl/messages.po index 75ead2095..eda50305c 100644 --- a/src/locale/locales/gl/messages.po +++ b/src/locale/locales/gl/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seguindo} other {seguindo}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {gustoulle} other {gustoulles}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accesibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Axustes de accesibilidade<<<<<<< HEAD" +msgstr "Axustes de accesibilidade" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Axustes de accesibilidade<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta<<<<<<< HEAD" +msgstr "Conta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Conta silenciada por listaxe" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opcións da conta<<<<<<< HEAD" +msgstr "Opcións da conta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Apelar esta decisión" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Aplicar canles recomendadas predeterminados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Aniversario<<<<<<< HEAD" +msgstr "Aniversario" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e eliminar<<<<<<< HEAD" +msgstr "Bloquear e eliminar" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloquear conta" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear Conta<<<<<<< HEAD" +msgstr "Bloquear Conta" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Cancelar a reactivación e pechar a sesión" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar procura<<<<<<< HEAD" +msgstr "Cancelar procura" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código<<<<<<< HEAD" +msgstr "Copiar código" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panel de depuración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desactivar a retroalimentación háptica" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Descargar ficheiro CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Rematar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo<<<<<<< HEAD" +msgstr "Seguindo" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Esquecéchelo?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Dálle ao teu perfil unha cara bonita" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Vibración" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Tes problemas?<<<<<<< HEAD" +msgstr "Tes problemas?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Se estás intentando cambiar o teu alcume ou enderezo electrónico, faino antes de desactivar a túa conta." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Introduce o código que se che enviou por correo electrónico" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etiquetado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquetado pola persoa autora.<<<<<<< HEAD" +msgstr "Etiquetado pola persoa autora." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Aprender máis" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensaxes<<<<<<< HEAD" +msgstr "Mensaxes" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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. <<<<<<< HEAD" +msgstr "A persoas moderadora decidiu establecer unha advertencia xeral sobre o contido. " #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "As miñas canles" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome<<<<<<< HEAD" +msgstr "Nome" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Aínda sen gústames<<<<<<< HEAD" +msgstr "Aínda sen gústames" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez<<<<<<< HEAD" +msgstr "Nudez" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Abrir o formulario de restablecemento do contrasinal" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Produciuse un erro ao cargar o chío. Comproba a túa conexión a Internet e téntao de novo." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Perfil actualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citas deshabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citas<<<<<<< HEAD" +msgstr "Citas" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Rechouchiado por ti" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Restablecer o estado de incorporación" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Restablecer o contrasinal<<<<<<< HEAD" +msgstr "Restablecer o contrasinal" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciencia<<<<<<< HEAD" +msgstr "Ciencia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Establecer aniversario" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Establecer un novo contrasinal<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Establecer un novo contrasinal" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Amosar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Amosar respostas como<<<<<<< HEAD" +msgstr "Amosar respostas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Mostrar advertencia" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar advertencia e filtrar desde as canles<<<<<<< HEAD" +msgstr "Mostrar advertencia e filtrar desde as canles" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Lixo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Suxerido para ti" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suxestivo<<<<<<< HEAD" +msgstr "Suxestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ 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" +msgstr "Condicións de servizo" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Houbo un problema ao contactar co servidor. Comproba a túa conexión a #: 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.<<<<<<< HEAD" +msgstr "Houbo un problema ao recuperar as notificacións. Toca aquí para tentalo de novo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Houbo un alude de novas persoas a Bluesky! Activaremos a túa conta en canto poidamos." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Este servizo de moderación non está disponíbel. Consulta máis detalles a continuación. Se o problema persiste, contáctanos." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Cancelouse a subscrición da listaxe" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Ver a entrada de depuración" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Consulta as túas contas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/hi/messages.po b/src/locale/locales/hi/messages.po index c140f368d..ccfef7141 100644 --- a/src/locale/locales/hi/messages.po +++ b/src/locale/locales/hi/messages.po @@ -98,7 +98,7 @@ 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 {फ़ॉलोइंग}}<<<<<<< HEAD" +msgstr "{0, plural, one {फ़ॉलोइंग} other {फ़ॉलोइंग}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, other {पसंद}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {पोस्ट}}<<<<<<< HEAD" +msgstr "{0, plural, other {पोस्ट}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "सुलभता" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "सुलभता के सेटिंग<<<<<<< HEAD" +msgstr "सुलभता के सेटिंग" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "सुलभता के सेटिंग<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "खाता<<<<<<< HEAD" +msgstr "खाता" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "सूची द्वारा खाता म्यूट किय #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "खाते के विकल्प<<<<<<< HEAD" +msgstr "खाते के विकल्प" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "ऐप पासवर्ड नाम में कम से कम 4 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "ऐप पासवर्ड<<<<<<< HEAD" +msgstr "ऐप पासवर्ड" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "इस निर्णय पर अपील करें<<<<<<< HEAD" +msgstr "इस निर्णय पर अपील करें" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "डिफ़ॉल्‍ट अनुशंसित फ़ीड लगा #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "जन्मदिन<<<<<<< HEAD" +msgstr "जन्मदिन" #: 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." @@ -1446,7 +1446,7 @@ msgstr "खाता अवरुद्ध करें" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "उपयोगकर्ता को अवरुद्ध करें #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "उपयोगकर्ता को अवरुद्ध करें<<<<<<< HEAD" +msgstr "उपयोगकर्ता को अवरुद्ध करें" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "अवरुद्ध करने पर भी आपके खाते पर लेबल लग सकता है, पर इससे यह खाता आपके थ्रेड में जवाब नहीं दे सकेगा या आपसे संपर्क नहीं कर सकेगा।" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "किताबें" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "खोज रद्द करें<<<<<<< HEAD" +msgstr "खोज रद्द करें" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "कोड कॉपी करें<<<<<<< HEAD" +msgstr "कोड कॉपी करें" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "कस्टम" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "पैनल डिबग करें" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "ईमेल 2FA अक्षम करें" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "कंपन फीडबैक अक्षम करें<<<<<<< HEAD<<<<<<< HEAD" +msgstr "कंपन फीडबैक अक्षम करें" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "Bluesky डाउनलोड करें" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR फ़ाइल डाउनलोड करें <<<<<<< HEAD" +msgstr "CAR फ़ाइल डाउनलोड करें " #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "सब" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "समाप्त करें" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "स्वास्थ्य<<<<<<< HEAD=======" +msgstr "स्वास्थ्य" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "फ़ॉलोइंग" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "फ़ॉलोइंग<<<<<<< HEAD" +msgstr "फ़ॉलोइंग" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "भूल गए?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "अपने प्रोफ़ाइल को एक चेहरा दें<<<<<<< HEAD" +msgstr "अपने प्रोफ़ाइल को एक चेहरा दें" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "कंपन" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "मुश्किल हो रही है?<<<<<<< HEAD" +msgstr "मुश्किल हो रही है?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "यदि आप अपना हैंडल या ईमेल बदलने का प्रयास कर रहे हैं, ऐसा निष्क्रिय करने से पहले करें।" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "खाता मिटाने किए लिए पासवर् #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "आपको ईमेल की गई कोड दर्ज करें<<<<<<< HEAD<<<<<<< HEAD" +msgstr "आपको ईमेल की गई कोड दर्ज करें" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0} द्वारा लेबल किया गया।" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "रचयिता द्वारा लेबल किया गया।<<<<<<< HEAD" +msgstr "रचयिता द्वारा लेबल किया गया।" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "अधिक जानें" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Bluesky पर क्या सार्वजनिक है, इस #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "संदेश<<<<<<< HEAD" +msgstr "संदेश" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "मॉडरेटर ने सामग्री पर सामान्य चेतावनी दी है।<<<<<<< HEAD" +msgstr "मॉडरेटर ने सामग्री पर सामान्य चेतावनी दी है।" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "मेरे फ़ीड" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "नाम<<<<<<< HEAD" +msgstr "नाम" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "अभी तक कोई पसंद नहीं<<<<<<< HEAD" +msgstr "अभी तक कोई पसंद नहीं" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "अभी" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "नग्नता<<<<<<< HEAD" +msgstr "नग्नता" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "पासवर्ड रीसेट फ़ॉर्म खोलें" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "@{0} को फ़ॉलो करते लोग" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "पोस्ट मिटाया गया" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "पोस्ट अपलोड करने में असफल। कृपया अपना इंटरनेट कनेक्शन जाँच लें और फिर प्रयास करें।<<<<<<< HEAD" +msgstr "पोस्ट अपलोड करने में असफल। कृपया अपना इंटरनेट कनेक्शन जाँच लें और फिर प्रयास करें।" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "प्रोफ़ाइल अपडेट की गई" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "क्वोट पोस्ट अक्षम किए गए" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "क्वोट<<<<<<< HEAD" +msgstr "क्वोट" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "आपने रीपोस्ट किया" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "ज्ञानप्राप्ति स्थिति को री #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "पासवर्ड रीसेट करें<<<<<<< HEAD" +msgstr "पासवर्ड रीसेट करें" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "विज्ञान<<<<<<< HEAD" +msgstr "विज्ञान" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "जन्मतिथि चुनें" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "नया पासवर्ड सेट करें<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "नया पासवर्ड सेट करें" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "जवाब दिखाएँ" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "जवाबों को ऐसे दिखाएँ<<<<<<< HEAD" +msgstr "जवाबों को ऐसे दिखाएँ" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "चेतावनी दिखाएँ" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "चेतावनी दिखाएँ और फ़ीड से फ़िल्टर करें<<<<<<< HEAD" +msgstr "चेतावनी दिखाएँ और फ़ीड से फ़िल्टर करें" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "स्पैम" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "आपके लिए सुझाव" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "भड़काऊ<<<<<<< HEAD" +msgstr "भड़काऊ" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "शर्तें" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "सेवा की शर्तें<<<<<<< HEAD" +msgstr "सेवा की शर्तें" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "सर्वर से संपर्क करने में सम #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "अधिसूचनाएँ लाने में समस्या हुई। फिर प्रयास करने के लिए यहाँ दबाएँ।<<<<<<< HEAD" +msgstr "अधिसूचनाएँ लाने में समस्या हुई। फिर प्रयास करने के लिए यहाँ दबाएँ।" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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 में नए उपयोगकर्ताओं की होड़ लगी है! हम आपका खाता जल्द ही सक्रिय करेंगे।<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky में नए उपयोगकर्ताओं की होड़ लगी है! हम आपका खाता जल्द ही सक्रिय करेंगे।" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "यह मॉडरेशन सेवा अनुपलब्ध है। अधिक जानकारी के लिए नीचे देखें। यदि यहा समस्या बनी रहती है, हमसे संपर्क करें।<<<<<<< HEAD" +msgstr "यह मॉडरेशन सेवा अनुपलब्ध है। अधिक जानकारी के लिए नीचे देखें। यदि यहा समस्या बनी रहती है, हमसे संपर्क करें।" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "रीपोस्ट पूर्ववत करें ({0, plural, one {# रीपोस्ट} other {# रीपोस्ट}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "सूची की सदस्यता छोड़ी गई" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "अधिक जानकारी के लिए ब्लॉग प #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "डीबग प्रविष्टि देखें<<<<<<< HEAD" +msgstr "डीबग प्रविष्टि देखें" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "अपने म्यूट किए गए खाते देखे #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/hu/messages.po b/src/locale/locales/hu/messages.po index 0dfd1b257..6f8c1e2fa 100644 --- a/src/locale/locales/hu/messages.po +++ b/src/locale/locales/hu/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {követett} other {követett}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {bejegyzés} other {bejegyzés}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Akadálymentesítés" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Akadálymentesítés<<<<<<< HEAD" +msgstr "Akadálymentesítés" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Akadálymentesítés<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Fiók<<<<<<< HEAD" +msgstr "Fiók" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Elnémított fiók (lista által)" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Fióklehetőségek<<<<<<< HEAD" +msgstr "Fióklehetőségek" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Állatkínzás>>>>>>> upstream/main" +msgstr "Állatkínzás" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +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" +msgstr "Hitelesítés a Blueskyon" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Bárki>>>>>>> upstream/main" +msgstr "Bárki" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Alkalmazásjelszók" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Döntés fellebbezése" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Lekéréses kérelem alkalmazása" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "Adj meg legalább 8 karaktert" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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ó" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Születésnap" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Fiókok letiltása" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Letiltás és törlés<<<<<<< HEAD" +msgstr "Letiltás és törlés" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Felhasználó letiltása" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Felhasználó letiltása<<<<<<< HEAD" +msgstr "Felhasználó letiltása" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ 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<<<<<<< HEAD" +msgstr "Keresés megszakítása" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Gyermekpornográfia>>>>>>> upstream/main" +msgstr "Gyermekpornográfia" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ 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<<<<<<< HEAD" +msgstr "Kód másolása" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Egyéni" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Testreszabás<<<<<<< HEAD" +msgstr "Testreszabás" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Rezgés letiltása" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Válaszadás letiltása>>>>>>> upstream/main" +msgstr "Válaszadás letiltása" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "CAR fájl letöltése" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ 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" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ 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" +msgstr "Minden más" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Befejezés" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitnesz<<<<<<< HEAD=======" +msgstr "Fitnesz" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Követett" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Követett<<<<<<< HEAD" +msgstr "Követett" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Elfelejtetted?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Szabadítsd fel a hírfolyamodat!<<<<<<< HEAD" +msgstr "Szabadítsd fel a hírfolyamodat!" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Adj arcot a profilodnak!<<<<<<< HEAD" +msgstr "Adj arcot a profilodnak!" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ 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?<<<<<<< HEAD" +msgstr "Problémába ütköztél?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Testreszabási lehetőségek elrejtése<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Testreszabási lehetőségek elrejtése" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +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!" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Fényképek mentéséhez a galériához való hozzáférés szükséges." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Megszemélyesítés>>>>>>> upstream/main" +msgstr "Megszemélyesítés" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "Alkalmazáson belüli, leküldéses, az Általad követett személyektől" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "E-mailben kapott kód megadása" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Feljegyezte a(z) {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Feljegyezte a szerző.<<<<<<< HEAD" +msgstr "Feljegyezte a szerző." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "További információ az életkor-igazolásról" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "További információ a <0>fiókbeállításokban." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Értesítések megosztott bejegyzések kedveléséről" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Üzenetlehetőségek" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Üzenetek<<<<<<< HEAD" +msgstr "Üzenetek" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Ezen a tartalmon általános figyelmeztetés van érvényben, egy moderátor döntése alapján." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Hírfolyamgyűjtemény" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Név<<<<<<< HEAD" +msgstr "Név" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Még nincsenek kedvelések" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Épp most" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Meztelenség<<<<<<< HEAD" +msgstr "Meztelenség" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Bejegyzések nyelvi beállításainak megnyitása" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Követett személyektől" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Az Általad követett személyek" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Az Általad megemlített személyek>>>>>>> upstream/main" +msgstr "Az Általad megemlített személyek" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "A bejegyzés közzététele meghiúsult. Ellenőrizd az internetkapcsolatot, majd próbáld újra." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ 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<<<<<<< HEAD" +msgstr "Idézések" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Megosztottad" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Megosztások<<<<<<< HEAD" +msgstr "Megosztások" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ 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<<<<<<< HEAD" +msgstr "Jelszó helyreállítása" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Tudomány<<<<<<< HEAD" +msgstr "Tudomány" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Új jelszó beállítása" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr "A megengedett személyek csoportjainak pontos megszabása>>>>>>> upstream/main" +msgstr "A megengedett személyek csoportjainak pontos megszabása" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Válaszok megjelenítése" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Válaszok megjelenése<<<<<<< HEAD" +msgstr "Válaszok megjelenése" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Figyelmeztetés és kiszűrés a hírfolyamokból" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Felnőtt tartalom" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8935,7 +8935,7 @@ 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" +msgstr "Felhasználási feltételek" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9119,7 +9119,7 @@ msgstr "Megszakadt a kapcsolat a kiszolgálóval. Ellenőrizd az internetkapcsol #: 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.<<<<<<< HEAD" +msgstr "Az értesítések frissítése meghiúsult. Koppints ide az újrapróbálkozáshoz." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9191,15 +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!<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Jelenleg rengeteg új felhasználó csatlakozik a Blueskyhoz. A fiókodat aktiválni fogjuk, amint tudjuk!" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 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" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9351,7 +9351,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9674,7 +9674,7 @@ 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" +msgstr "Megosztás visszavonása ({0, plural, one {# megosztás} other {# megosztás}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9825,7 +9825,7 @@ 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}<<<<<<< HEAD" +msgstr "Nem támogatott videóformátum: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10211,7 +10211,7 @@ 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<<<<<<< HEAD" +msgstr "Hibakeresési bejegyzés megtekintése" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10293,7 +10293,7 @@ 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" +msgstr "Saját hitelesítések megtekintése" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10310,7 +10310,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Erőszakos vagy fenyegető tartalom>>>>>>> upstream/main" +msgstr "Erőszakos vagy fenyegető tartalom" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10594,7 +10594,7 @@ msgstr "Miért kell ezt a felhasználót átvizsgálni?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/ia/messages.po b/src/locale/locales/ia/messages.po index 476401369..f1298ea5e 100644 --- a/src/locale/locales/ia/messages.po +++ b/src/locale/locales/ia/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {sequito} other {sequitos}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publication} other {publicationes}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accessibilitate" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Parametros de accessibilitate<<<<<<< HEAD" +msgstr "Parametros de accessibilitate" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Parametros de accessibilitate<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conto<<<<<<< HEAD" +msgstr "Conto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Conto silentiate per lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Optiones de conto<<<<<<< HEAD" +msgstr "Optiones de conto" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Annuncio del verification super Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Annuncio del verification super Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Contrasignos de application" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Facer appello de iste decision" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Applicar le canales recommendate predefinite" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Assignar topico pro le algorithmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Data de nascentia<<<<<<< HEAD" +msgstr "Data de nascentia" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blocar contos" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocar e deler<<<<<<< HEAD" +msgstr "Blocar e deler" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blocar usator" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocar usator<<<<<<< HEAD" +msgstr "Blocar usator" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Libros" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Cancellar le reactivation e clauder session" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancellar cerca<<<<<<< HEAD" +msgstr "Cancellar cerca" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Copiar le DID del autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar codice<<<<<<< HEAD" +msgstr "Copiar codice" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalisate" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Optiones de personalisation<<<<<<< HEAD" +msgstr "Optiones de personalisation" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Pannello de depuration" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Disactivar le retroaction haptic" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Discargar file CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Totes" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tote le resto<<<<<<< HEAD" +msgstr "Tote le resto" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Finir" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Sequente" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Sequente<<<<<<< HEAD" +msgstr "Sequente" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Tu lo ha oblidate?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Da un facie a tu profilo<<<<<<< HEAD" +msgstr "Da un facie a tu profilo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Technologia haptic" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Tu ha un codice? <0>Clicca hic." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Problemas?<<<<<<< HEAD" +msgstr "Problemas?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Occultar optiones de personalisation<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Occultar optiones de personalisation" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Si tu tenta cambiar de pseudonymo o de adresse de e-mail, face lo ante disactivar." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Imagines non pote esser salvate a minus que tu concede permission de accesso a tu bibliotheca de photos." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "Interne al application, push, personas que tu seque" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Insere le codice que ha essite inviate a tu e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etiquettate per {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etiquettate per le autor.<<<<<<< HEAD" +msgstr "Etiquettate per le autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Saper plus" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Appreciationes de tu republicationes" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificationes de appreciationes de tu republicationes<<<<<<< HEAD" +msgstr "Notificationes de appreciationes de tu republicationes" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Optiones de messages" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messages<<<<<<< HEAD" +msgstr "Messages" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Notificationes diverse" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Le moderator ha optate pro poner un advertimento general super le contento." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mi canales" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nomine<<<<<<< HEAD" +msgstr "Nomine" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Necun imagine" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Necun appreciation ancora<<<<<<< HEAD" +msgstr "Necun appreciation ancora" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Ora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuditate<<<<<<< HEAD" +msgstr "Nuditate" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Aperi le formulario de reinitialisation de contrasigno" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Personas que io seque" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Non ha essite possibile cargar le publication. Verifica tu connexion al Internet e tenta de novo." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profilo actualisate" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citationes disactivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citationes<<<<<<< HEAD" +msgstr "Citationes" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republicate per te" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicationes<<<<<<< HEAD" +msgstr "Republicationes" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Reinitialisar stato de apprentissage" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reinitialisar contrasigno<<<<<<< HEAD" +msgstr "Reinitialisar contrasigno" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scientia<<<<<<< HEAD" +msgstr "Scientia" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Definir data de nascentia" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir nove contrasigno<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Definir nove contrasigno" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Monstrar responsas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Monstrar responsas como<<<<<<< HEAD" +msgstr "Monstrar responsas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Monstrar advertimento" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Monstrar advertimento e filtrar desde canales<<<<<<< HEAD" +msgstr "Monstrar advertimento e filtrar desde canales" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Suggerite pro te" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestive<<<<<<< HEAD" +msgstr "Suggestive" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Terminos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Conditiones de servicio<<<<<<< HEAD" +msgstr "Conditiones de servicio" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Il ha habite un problema durante le connexion con le servitor, verifica #: 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.<<<<<<< HEAD" +msgstr "Il ha habite un problema durante le recuperation del notificationes. Tocca hic pro tentar de novo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Il ha habite un grande quantitate de usatores nove a Bluesky! Nos activara tu conto le plus tosto possibile." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Iste servicio de moderation es indisponibile. Vide hic infra pro plus detalios. Si iste problema persiste, contacta nos." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Disfacer republication ({0, plural, one {# republication} other {# republicationes}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Cancellate le subscription del lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Vider le publication de blog pro plus detalios" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vider entrata de depuration<<<<<<< HEAD" +msgstr "Vider entrata de depuration" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Vider tu contos silentiate" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vider tu verificationes<<<<<<< HEAD" +msgstr "Vider tu verificationes" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/id/messages.po b/src/locale/locales/id/messages.po index f79e50dd9..c18c17180 100644 --- a/src/locale/locales/id/messages.po +++ b/src/locale/locales/id/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, other {mengikuti}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, other {suka}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {postingan}}<<<<<<< HEAD" +msgstr "{0, plural, other {postingan}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Aksesibilitas" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Pengaturan Aksesibilitas<<<<<<< HEAD" +msgstr "Pengaturan Aksesibilitas" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Pengaturan Aksesibilitas<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Akun<<<<<<< HEAD" +msgstr "Akun" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Akun Dibisukan oleh Daftar" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Pengaturan akun<<<<<<< HEAD" +msgstr "Pengaturan akun" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Mengumumkan verifikasi Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Mengumumkan verifikasi Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Sandi aplikasi" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Ajukan banding atas keputusan ini" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Tambahkan feed bawaan yang direkomendasikan" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Tetapkan topik untuk algoritma" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Tanggal lahir<<<<<<< HEAD" +msgstr "Tanggal lahir" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blokir akun" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokir dan Hapus<<<<<<< HEAD" +msgstr "Blokir dan Hapus" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blokir pengguna" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blokir Pengguna<<<<<<< HEAD" +msgstr "Blokir Pengguna" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Memblokir tidak akan mencegah label diterapkan pada akun Anda, tetapi akan menghentikan akun ini untuk membalas atau berinteraksi dengan Anda." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Buku" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Batalkan pengaktifan kembali dan keluar" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Batal mencari<<<<<<< HEAD" +msgstr "Batal mencari" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Salin DID pemosting" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Salin kode<<<<<<< HEAD" +msgstr "Salin kode" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Kustom" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opsi penyesuaian<<<<<<< HEAD" +msgstr "Opsi penyesuaian" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panel awakutu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "Nonaktifkan Email 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Matikan respons haptik<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Matikan respons haptik" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Unduh berkas CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Semua orang" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Selesai" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Kebugaran<<<<<<< HEAD=======" +msgstr "Kebugaran" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Mengikuti" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Mengikuti<<<<<<< HEAD" +msgstr "Mengikuti" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Lupa?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Bebaskan feed Anda<<<<<<< HEAD" +msgstr "Bebaskan feed Anda" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Beri wajah pada profil Anda<<<<<<< HEAD" +msgstr "Beri wajah pada profil Anda" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptik" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Punya kode? <0>Klik di sini." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Mengalami masalah?<<<<<<< HEAD" +msgstr "Mengalami masalah?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Sembunyikan opsi penyesuaian<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Sembunyikan opsi penyesuaian" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Jika ingin mengubah panggilan atau email, lakukanlah sebelum Anda menonaktifkan akun." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Gambar tidak dapat disimpan kecuali diizinkan untuk mengakses pustaka foto Anda." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "Dalam aplikasi, Push, Orang yang saya ikuti" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Masukkan kode yang telah dikirim ke email Anda" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Dilabeli oleh {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Dilabeli oleh pemosting.<<<<<<< HEAD" +msgstr "Dilabeli oleh pemosting." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Pelajari Lebih Lanjut" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Suka pada postingan ulang Anda" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Suka pada notifikasi postingan ulang Anda<<<<<<< HEAD" +msgstr "Suka pada notifikasi postingan ulang Anda" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Opsi pesan" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Pesan<<<<<<< HEAD" +msgstr "Pesan" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "Notifikasi lainnya" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderator telah memilih untuk menetapkan peringatan umum pada konten." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Daftar Feed Saya" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nama<<<<<<< HEAD" +msgstr "Nama" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Belum ada yang menyukai" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Sekarang" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Ketelanjangan<<<<<<< HEAD" +msgstr "Ketelanjangan" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Membuka formulir pengaturan ulang kata sandi" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Postingan gagal diunggah. Silakan periksa koneksi internet Anda dan coba lagi." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profil diperbarui" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Kutipan dinonaktifkan" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Kutipan<<<<<<< HEAD" +msgstr "Kutipan" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Diposting ulang oleh Anda" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Reset status orientasi" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reset kata sandi<<<<<<< HEAD" +msgstr "Reset kata sandi" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Sains<<<<<<< HEAD" +msgstr "Sains" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Atur tanggal lahir" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Buat kata sandi baru<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Buat kata sandi baru" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Tampilkan balasan" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Tampilkan balasan<<<<<<< HEAD" +msgstr "Tampilkan balasan" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Tampilkan peringatan" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Tampilkan peringatan dan saring dari feed<<<<<<< HEAD" +msgstr "Tampilkan peringatan dan saring dari feed" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Disarankan untuk Anda" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestif<<<<<<< HEAD" +msgstr "Sugestif" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Ketentuan" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Ketentuan Layanan<<<<<<< HEAD" +msgstr "Ketentuan Layanan" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Ada masalah saat menghubungi server, silakan periksa koneksi internet An #: 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.<<<<<<< HEAD" +msgstr "Ada masalah saat mengambil notifikasi. Ketuk di sini untuk mencoba lagi." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Terjadi lonjakan pengguna baru di Bluesky! Kami akan mengaktifkan akun Anda secepat mungkin." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Layanan moderasi ini tidak tersedia. Lihat detail lebih lanjut di bawah. Jika masalah berlanjut, hubungi kami." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Batal posting ulang ({0, plural, other {# postingan ulang}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Telah berhenti berlangganan dari daftar" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Lihat postingan blog untuk detail lebih lanjut" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Lihat entri debug<<<<<<< HEAD" +msgstr "Lihat entri debug" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Lihat daftar akun yang Anda bisukan" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Lihat verifikasi Anda<<<<<<< HEAD" +msgstr "Lihat verifikasi Anda" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/it/messages.po b/src/locale/locales/it/messages.po index 7243945e7..e5c112eff 100644 --- a/src/locale/locales/it/messages.po +++ b/src/locale/locales/it/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seguito} other {seguiti}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {post} other {post}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accessibilità" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Impostazioni di accessibilità<<<<<<< HEAD" +msgstr "Impostazioni di accessibilità" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Impostazioni di accessibilità<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account<<<<<<< HEAD" +msgstr "Account" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Account silenziato dalla lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opzioni dell'account<<<<<<< HEAD" +msgstr "Opzioni dell'account" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Benessere degli animali>>>>>>> upstream/main" +msgstr "Benessere degli animali" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Annuncio" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Annuncio delle verifiche in Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Annuncio delle verifiche in Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Chiunque>>>>>>> upstream/main" +msgstr "Chiunque" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Password per app" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Fai ricorso contro questa decisione" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Applica pull request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Assegna argomento per l'algoritmo" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Almeno 8 caratteri<<<<<<< HEAD" +msgstr "Almeno 8 caratteri" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "Ritorno utente bloccato>>>>>>> upstream/main" +msgstr "Ritorno utente bloccato" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Compleanno" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blocca gli account" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocca ed elimina<<<<<<< HEAD" +msgstr "Blocca ed elimina" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blocca utente" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocca utente<<<<<<< HEAD" +msgstr "Blocca utente" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Annulla la riattivazione e disconnettiti" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Annulla la ricerca<<<<<<< HEAD" +msgstr "Annulla la ricerca" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Materiale pedopornografico>>>>>>> upstream/main" +msgstr "Materiale pedopornografico" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Copia DID dell'autore" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copia codice<<<<<<< HEAD" +msgstr "Copia codice" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizzato" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opzioni di personalizzazione<<<<<<< HEAD" +msgstr "Opzioni di personalizzazione" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Disattiva il feedback tattile" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Disabilita tutte le risposte>>>>>>> upstream/main" +msgstr "Disabilita tutte le risposte" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Scarica il file CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Diffusione di dati personali>>>>>>> upstream/main" +msgstr "Diffusione di dati personali" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Tutti" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tutto il resto<<<<<<< HEAD" +msgstr "Tutto il resto" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Finalizza" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seguito" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguito<<<<<<< HEAD" +msgstr "Seguito" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Password dimenticata?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libera il tuo feed<<<<<<< HEAD" +msgstr "Libera il tuo feed" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dai un volto al tuo profilo<<<<<<< HEAD" +msgstr "Dai un volto al tuo profilo" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Hai un codice? <0>Fai clic qui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Ci sono problemi?<<<<<<< HEAD" +msgstr "Ci sono problemi?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Nascondi opzioni di personalizzazione<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Nascondi opzioni di personalizzazione" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Se stai cercando di cambiare nome utente o email, puoi farlo prima di disattivare l'account." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Per salvare le immagini è necessario concedere l'accesso alla tua libreria foto." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Impersonificazione>>>>>>> upstream/main" +msgstr "Impersonificazione" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "Nell'app, Push, Persone che segui" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Inserisci il codice che ti è stato inviato via email" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etichettato da {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etichettato dall'autore.<<<<<<< HEAD" +msgstr "Etichettato dall'autore." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Ulteriori Informazioni" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Scopri di più sulla verifica dell'età<<<<<<< HEAD" +msgstr "Scopri di più sulla verifica dell'età" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Scopri di più nelle <0>impostazioni dell'account." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Mi piace dei tuoi repost" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notifiche dei mi piace dei tuoi repost<<<<<<< HEAD" +msgstr "Notifiche dei mi piace dei tuoi repost" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Opzioni messaggio" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Messaggi<<<<<<< HEAD" +msgstr "Messaggi" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Il moderatore ha messo un avviso generale sul contenuto." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "I miei feed" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome<<<<<<< HEAD" +msgstr "Nome" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Ancora nessun mi piace" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Adesso" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudità<<<<<<< HEAD" +msgstr "Nudità" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Apre le impostazioni sulla lingua dei post" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Persone che seguo" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Persone che segui" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Persone che menzioni>>>>>>> upstream/main" +msgstr "Persone che menzioni" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Non è stato possibile inviare il post. Verifica la tua connessione a internet e riprova." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citazioni disattivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citazioni<<<<<<< HEAD" +msgstr "Citazioni" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Ripubblicato da te" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repost<<<<<<< HEAD" +msgstr "Repost" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Ripristina lo stato di registrazione" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Reimposta la password<<<<<<< HEAD" +msgstr "Reimposta la password" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Scienza<<<<<<< HEAD" +msgstr "Scienza" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Imposta la data di nascita" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Imposta una nuova password<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Imposta una nuova password" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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>>>>>>> upstream/main" +msgstr "Imposta con precisione quali gruppi di persone possono rispondere al tuo post" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Mostra risposte" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostra risposte come<<<<<<< HEAD" +msgstr "Mostra risposte come" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Mostra avviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostra avviso e filtra dai feed<<<<<<< HEAD" +msgstr "Mostra avviso e filtra dai feed" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Suggerito per te" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestivo<<<<<<< HEAD" +msgstr "Suggestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Termini" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termini di servizio<<<<<<< HEAD" +msgstr "Termini di servizio" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Si è verificato un problema contattando il server, verifica la tua conn #: 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.<<<<<<< HEAD" +msgstr "Si è verificato un problema durante il recupero delle notifiche. Tocca qui per riprovare." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "C'è stata un'ondata di nuovi utenti su Bluesky! Attiveremo il tuo account il prima possibile." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "Queste sono le tue impostazioni predefinite>>>>>>> upstream/main" +msgstr "Queste sono le tue impostazioni predefinite" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Questo servizio di moderazione non è disponibile. Vedi giù per ulteriori dettagli. Se il problema persiste, contattaci." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Annulla repost ({0, plural, one {# repost} other {# repost}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Disiscritto dalla lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tipo di video non supportato: {mimeType}<<<<<<< HEAD" +msgstr "Tipo di video non supportato: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Vedi il post del blog per maggiori dettagli" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Vedi le informazioni del debug<<<<<<< HEAD" +msgstr "Vedi le informazioni del debug" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Vedi i tuoi account silenziati" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vedi le tue verifiche<<<<<<< HEAD" +msgstr "Vedi le tue verifiche" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Contenuto violento o minaccioso>>>>>>> upstream/main" +msgstr "Contenuto violento o minaccioso" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Perché questo utente dovrebbe essere esaminato?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po index 579e80b5e..d730076fa 100644 --- a/src/locale/locales/ja/messages.po +++ b/src/locale/locales/ja/messages.po @@ -98,7 +98,7 @@ 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 {フォロー中}}<<<<<<< HEAD" +msgstr "{0, plural, other {フォロー中}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, other {いいね}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {投稿}}<<<<<<< HEAD" +msgstr "{0, plural, other {投稿}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "アクセシビリティ" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "アクセシビリティの設定<<<<<<< HEAD" +msgstr "アクセシビリティの設定" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "アクセシビリティの設定<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "アカウント<<<<<<< HEAD" +msgstr "アカウント" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "リストによってミュート中のアカウント" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "アカウントオプション<<<<<<< HEAD" +msgstr "アカウントオプション" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "動物の福祉>>>>>>> upstream/main" +msgstr "動物の福祉" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "お知らせ" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Blueskyでの認証のお知らせ<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Blueskyでの認証のお知らせ" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "誰でも>>>>>>> upstream/main" +msgstr "誰でも" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "アプリパスワードの名前は長さが4文字以上である必 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "アプリパスワード<<<<<<< HEAD" +msgstr "アプリパスワード" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "アカウント停止に異議申し立て" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "この決定に異議を申し立てる<<<<<<< HEAD" +msgstr "この決定に異議を申し立てる" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "デフォルトのおすすめフィードを追加" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "プルリクエストを適用<<<<<<< HEAD" +msgstr "プルリクエストを適用" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "アルゴリズム用にトピックを割り当て" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "少なくとも8文字<<<<<<< HEAD" +msgstr "少なくとも8文字" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "BANされたユーザーの帰還>>>>>>> upstream/main" +msgstr "BANされたユーザーの帰還" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ msgstr "年齢保証プロセスを開始するには、以下のフィールド #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生年月日<<<<<<< HEAD" +msgstr "生年月日" #: 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." @@ -1446,7 +1446,7 @@ msgstr "アカウントをブロック" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "ブロックと削除<<<<<<< HEAD" +msgstr "ブロックと削除" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "ユーザーをブロック" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "ユーザーをブロック<<<<<<< HEAD" +msgstr "ユーザーをブロック" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "ブロックしてもこのラベラーがあなたのアカウントにラベルを適用することができますが、このアカウントがあなたのスレッドに返信したり、やりとりをしたりといったことはできなくなります。" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "再有効化をキャンセルしてサインアウト" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "検索をキャンセル<<<<<<< HEAD" +msgstr "検索をキャンセル" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "児童性的虐待コンテンツ（CSAM）>>>>>>> upstream/main" +msgstr "児童性的虐待コンテンツ（CSAM）" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "投稿者のDIDをコピー" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "コードをコピー<<<<<<< HEAD" +msgstr "コードをコピー" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "カスタム" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "カスタマイズオプション<<<<<<< HEAD" +msgstr "カスタマイズオプション" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "メールでの2要素認証を無効にする" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "触覚フィードバックを無効化<<<<<<< HEAD<<<<<<< HEAD" +msgstr "触覚フィードバックを無効化" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "返信を完全に無効にする>>>>>>> upstream/main" +msgstr "返信を完全に無効にする" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ msgstr "Blueskyをダウンロード" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CARファイルをダウンロード<<<<<<< HEAD" +msgstr "CARファイルをダウンロード" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "ドクシング（個人情報晒し）>>>>>>> upstream/main" +msgstr "ドクシング（個人情報晒し）" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "全員" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "他すべて<<<<<<< HEAD" +msgstr "他すべて" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "完了" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "フィットネス<<<<<<< HEAD=======" +msgstr "フィットネス" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "フォロー中" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "フォロー中<<<<<<< HEAD" +msgstr "フォロー中" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "忘れた？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "フィードを解放しよう<<<<<<< HEAD" +msgstr "フィードを解放しよう" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "プロフィールに顔をつける<<<<<<< HEAD" +msgstr "プロフィールに顔をつける" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "グルーミングまたは捕食的行為（性的搾取目的の接近 #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "ハッキングまたはシステム攻撃>>>>>>> upstream/main" +msgstr "ハッキングまたはシステム攻撃" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "コードがありませんか？<0>ここをクリックしてくださ #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "なにか問題が発生しましたか？<<<<<<< HEAD" +msgstr "なにか問題が発生しましたか？" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "カスタマイズオプションを非表示<<<<<<< HEAD<<<<<<< HEAD" +msgstr "カスタマイズオプションを非表示" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "ハンドルやメールアドレスを変えるのであれば、無効化の前に変更してください。" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "画像を保存しました" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "写真ライブラリへのアクセスが許可されない限り、画像を保存できません。<<<<<<< HEAD" +msgstr "写真ライブラリへのアクセスが許可されない限り、画像を保存できません。" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "なりすまし>>>>>>> upstream/main" +msgstr "なりすまし" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "アプリ内、プッシュ、全員" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "アプリ内、プッシュ、フォロー中の人<<<<<<< HEAD" +msgstr "アプリ内、プッシュ、フォロー中の人" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "アカウント削除のためにパスワードを入力" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "メールで送られたコードを入力<<<<<<< HEAD<<<<<<< HEAD" +msgstr "メールで送られたコードを入力" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0}によるラベル" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "投稿者によるラベル。<<<<<<< HEAD" +msgstr "投稿者によるラベル。" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "詳細" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "年齢保証について詳しく知る<<<<<<< HEAD" +msgstr "年齢保証について詳しく知る" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Blueskyで公開されている内容はこちらを参照してくだ #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<0>アカウント設定で詳細を確認する。<<<<<<< HEAD" +msgstr "<0>アカウント設定で詳細を確認する。" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "リポストへのいいね" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "リポストへのいいねの通知<<<<<<< HEAD" +msgstr "リポストへのいいねの通知" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "メッセージのオプション" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "メッセージ<<<<<<< HEAD" +msgstr "メッセージ" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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 "モデレーターによりコンテンツに一般的な警告が設定されました。<<<<<<< HEAD" +msgstr "モデレーターによりコンテンツに一般的な警告が設定されました。" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "マイフィード" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名前<<<<<<< HEAD" +msgstr "名前" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "画像なし" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "いいねはありません<<<<<<< HEAD" +msgstr "いいねはありません" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "今" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "ヌード<<<<<<< HEAD" +msgstr "ヌード" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "パスワードリセットのフォームを開く" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "投稿言語の設定を開く<<<<<<< HEAD" +msgstr "投稿言語の設定を開く" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +6398,7 @@ msgstr "その他の性的暴力に関するコンテンツ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "その他の暴力的コンテンツ>>>>>>> upstream/main" +msgstr "その他の暴力的コンテンツ" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ msgstr "@{0}をフォロー中のユーザー" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "フォロー中の人<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "フォロー中の人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "フォロー中の人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "メンションした人>>>>>>> upstream/main" +msgstr "メンションした人" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "投稿を削除しました" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "投稿のアップロードに失敗しました。インターネット接続を確認し、再度試してください。<<<<<<< HEAD" +msgstr "投稿のアップロードに失敗しました。インターネット接続を確認し、再度試してください。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "ちょっと！この投稿に誰が反応できるか、編集できますよ。>>>>>>> upstream/main" +msgstr "ちょっと！この投稿に誰が反応できるか、編集できますよ。" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "引用投稿は無効です" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用<<<<<<< HEAD" +msgstr "引用" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "あなたのリポスト" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "リポスト<<<<<<< HEAD" +msgstr "リポスト" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "オンボーディングの状態をリセット" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "パスワードをリセット<<<<<<< HEAD" +msgstr "パスワードをリセット" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科学<<<<<<< HEAD" +msgstr "科学" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "生年月日を設定" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "新しいパスワードを設定<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "新しいパスワードを設定" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr "投稿に返信できるグループを正確に設定します>>>>>>> upstream/main" +msgstr "投稿に返信できるグループを正確に設定します" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "返信を表示" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "返信の表示方法<<<<<<< HEAD" +msgstr "返信の表示方法" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "警告を表示" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "警告の表示とフィードからのフィルタリング<<<<<<< HEAD" +msgstr "警告の表示とフィードからのフィルタリング" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "あなたへのおすすめ" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "きわどい<<<<<<< HEAD" +msgstr "きわどい" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "規約" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "利用規約<<<<<<< HEAD" +msgstr "利用規約" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "サーバーへの問い合わせ中に問題が発生したので、イ #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "通知の取得中に問題が発生しました。もう一度試すにはこちらをタップしてください。<<<<<<< HEAD" +msgstr "通知の取得中に問題が発生しました。もう一度試すにはこちらをタップしてください。" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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に新規ユーザーが殺到しています！できるだけ早くアカウントを有効にできるよう努めます。<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Blueskyに新規ユーザーが殺到しています！できるだけ早くアカウントを有効にできるよう努めます。" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "これらはデフォルトの設定です>>>>>>> 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 "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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 "このモデレーションのサービスはご利用できません。詳細は以下をご覧ください。この問題が解決しない場合は、サポートへお問い合わせください。<<<<<<< HEAD" +msgstr "このモデレーションのサービスはご利用できません。詳細は以下をご覧ください。この問題が解決しない場合は、サポートへお問い合わせください。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "リポストを元に戻す（{0, plural, other {#件のリポスト}}）" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "リストの登録を解除しました" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "サポートしていないビデオ形式：{mimeType}<<<<<<< HEAD" +msgstr "サポートしていないビデオ形式：{mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "詳細についてのブログの記事を見る" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "デバッグエントリーを表示<<<<<<< HEAD" +msgstr "デバッグエントリーを表示" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "ミュートしたアカウントを見る" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "あなたの認証情報を表示<<<<<<< HEAD" +msgstr "あなたの認証情報を表示" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "暴力的または脅迫的なコンテンツ>>>>>>> upstream/main" +msgstr "暴力的または脅迫的なコンテンツ" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "なぜこのユーザーをレビューする必要がありますか？ #: src/components/dms/AfterReportDialog.tsx:49 msgid "Would you like to block this user and/or delete this conversation?" -msgstr "ユーザーをブロックするかこの会話を削除しますか（あるいは両方）？>>>>>>> upstream/main" +msgstr "ユーザーをブロックするかこの会話を削除しますか（あるいは両方）？" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/km/messages.po b/src/locale/locales/km/messages.po index 875939627..9d7942f70 100644 --- a/src/locale/locales/km/messages.po +++ b/src/locale/locales/km/messages.po @@ -98,7 +98,7 @@ 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 {អ្នកកំពុងតាម}}<<<<<<< HEAD" +msgstr "{0, plural, one {អ្នកកំពុងតាម} other {អ្នកកំពុងតាម}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "ភាពងាយស្រួល" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "ការកំណត់មានភាពងាយស្រួល<<<<<<< HEAD" +msgstr "ការកំណត់មានភាពងាយស្រួល" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "ការកំណត់មានភាពងាយស្រួល<<<<<< #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "គណនី<<<<<<< HEAD" +msgstr "គណនី" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "គណនីត្រូវបានបិទសំឡេងដោយប #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "ជម្រើសគណនី<<<<<<< HEAD" +msgstr "ជម្រើសគណនី" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,7 +1134,7 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" @@ -1189,7 +1189,7 @@ msgstr "ឈ្មោះពាក្យសម្ងាត់កម្មវិធ #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "ពាក្យសម្ងាត់កម្មវិធី<<<<<<< HEAD" +msgstr "ពាក្យសម្ងាត់កម្មវិធី" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "ប្តឹងឧទ្ធរណ៍លើការសម្រេចចិត្តនេះ។<<<<<<< HEAD" +msgstr "ប្តឹងឧទ្ធរណ៍លើការសម្រេចចិត្តនេះ។" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "អនុវត្ត​មតិព័ត៌មាន​ដែល​ប #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "ថ្ងៃកំណើត<<<<<<< HEAD" +msgstr "ថ្ងៃកំណើត" #: 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." @@ -1446,7 +1446,7 @@ msgstr "បិទគណនី" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "ការទប់ស្កាត់នឹងមិនរារាំងស្លាកមិនឱ្យអនុវត្តនៅលើគណនីរបស់អ្នកទេ ប៉ុន្តែវានឹងបញ្ឈប់គណនីនេះពីការឆ្លើយតបនៅក្នុងខ្សែស្រឡាយរបស់អ្នក ឬធ្វើអន្តរកម្មជាមួយអ្នក" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "សៀវភៅ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "បោះបង់ការបើកដំណើរការឡើងវ #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "បោះបង់ការស្វែងរក<<<<<<< HEAD" +msgstr "បោះបង់ការស្វែងរក" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "ចម្លងកូដ<<<<<<< HEAD" +msgstr "ចម្លងកូដ" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "បិទអ៊ីមែល 2FA" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "បិទ​រំញ័រ<<<<<<< HEAD<<<<<<< HEAD" +msgstr "បិទ​រំញ័រ" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "ទាំងអស់គ្នា" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "បញ្ចប់" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "សម្បទា<<<<<<< HEAD=======" +msgstr "សម្បទា" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "កំពុងតាម" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "កំពុងតាម<<<<<<< HEAD" +msgstr "កំពុងតាម" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "ភ្លេច?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "ផ្តល់ទម្រង់មុខរបស់អ្នក<<<<<<< HEAD" +msgstr "ផ្តល់ទម្រង់មុខរបស់អ្នក" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "មានបញ្ហា?<<<<<<< HEAD" +msgstr "មានបញ្ហា?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "ប្រសិនបើអ្នកកំពុងព្យាយាមផ្លាស់ប្តូរចំណុចទាញ ឬអ៊ីមែលរបស់អ្នក សូមធ្វើដូច្នេះមុនពេលអ្នកបិទដំណើរការ" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "បញ្ចូលពាក្យសម្ងាត់សម្រាប #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "បញ្ចូលលេខកូដដែលបានផ្ញើទៅអ្នក<<<<<<< HEAD<<<<<<< HEAD" +msgstr "បញ្ចូលលេខកូដដែលបានផ្ញើទៅអ្នក" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "ដាក់ស្លាកដោយ {0}" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "ដាក់ស្លាកដោយអ្នកនិពន្ធ<<<<<<< HEAD" +msgstr "ដាក់ស្លាកដោយអ្នកនិពន្ធ" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "ស្វែងយល់បន្ថែម" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "ស្វែងយល់បន្ថែមអំពីអ្វីដែ #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "សារ<<<<<<< HEAD" +msgstr "សារ" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "អ្នកសម្របសម្រួលបានជ្រើសរើសដើម្បីកំណត់ការព្រមានទូទៅលើខ្លឹមសារ<<<<<<< HEAD" +msgstr "អ្នកសម្របសម្រួលបានជ្រើសរើសដើម្បីកំណត់ការព្រមានទូទៅលើខ្លឹមសារ" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "មតិព័ត៌មានរបស់ខ្ញុំ" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "មិនទាន់មានអ្នកចូលចិត្តទេ<<<<<<< HEAD" +msgstr "មិនទាន់មានអ្នកចូលចិត្តទេ" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "ឥឡូវនេះ" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "អាក្រាតកាយ<<<<<<< HEAD" +msgstr "អាក្រាតកាយ" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "បើកទម្រង់កំណត់ពាក្យសម្ងា #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "មនុស្ស​តាម @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "Post ត្រូវាបានលុប" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "មិនអាចបង្ហោះសារបង្ហោះបានទេ។ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នក ហើយព្យាយាមម្តងទៀត<<<<<<< HEAD" +msgstr "មិនអាចបង្ហោះសារបង្ហោះបានទេ។ សូមពិនិត្យមើលការតភ្ជាប់អ៊ីនធឺណិតរបស់អ្នក ហើយព្យាយាមម្តងទៀត" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "បានធ្វើបច្ចុប្បន្នភាពប្រ #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Quote posts ត្រូវបានបិទ" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "ផ្សាយឡើងវិញដោយអ្នក" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "កំណត់ស្ថានភាពចាប់ផ្តើមឡើ #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "កំណត់ពាក្យសម្ងាត់ឡើងវិញ<<<<<<< HEAD" +msgstr "កំណត់ពាក្យសម្ងាត់ឡើងវិញ" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "វិទ្យាសាស្ត្រ<<<<<<< HEAD" +msgstr "វិទ្យាសាស្ត្រ" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "កំណត់ថ្ងៃខែឆ្នាំកំណើត" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "កំណត់ពាក្យសម្ងាត់ថ្មី<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "កំណត់ពាក្យសម្ងាត់ថ្មី" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "បង្ហាញការឆ្លើយតប" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "បង្ហាញការព្រមាន" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "បង្ហាញការព្រមាន និងត្រងពីមតិព័ត៌មាន<<<<<<< HEAD" +msgstr "បង្ហាញការព្រមាន និងត្រងពីមតិព័ត៌មាន" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "សារឥតបានការ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "បានណែនាំសម្រាប់អ្នក" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "ណែនាំ<<<<<<< HEAD" +msgstr "ណែនាំ" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "លក្ខខណ្ឌ" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "លក្ខខណ្ឌនៃសេវាកម្ម<<<<<<< HEAD" +msgstr "លក្ខខណ្ឌនៃសេវាកម្ម" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "មានបញ្ហាក្នុងការទាក់ទងម៉ #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "មានបញ្ហាក្នុងការទាញយកការជូនដំណឹង។ ចុចទីនេះដើម្បីព្យាយាមម្តងទៀត<<<<<<< HEAD" +msgstr "មានបញ្ហាក្នុងការទាញយកការជូនដំណឹង។ ចុចទីនេះដើម្បីព្យាយាមម្តងទៀត" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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! យើងនឹងដំណើរការគណនីរបស់អ្នកឱ្យបានឆាប់តាមដែលយើងអាចធ្វើបាន<<<<<<< HEAD<<<<<<< HEAD" +msgstr "មានការប្រញាប់ប្រញាល់នៃអ្នកប្រើប្រាស់ថ្មីទៅកាន់ Bluesky! យើងនឹងដំណើរការគណនីរបស់អ្នកឱ្យបានឆាប់តាមដែលយើងអាចធ្វើបាន" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "សេវាកម្មសម្របសម្រួលនេះមិនមានទេ។ សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិតបន្ថែម។ ប្រសិនបើបញ្ហានេះនៅតែបន្តកើតមាន សូមទាក់ទងមកយើងខ្ញុំ<<<<<<< HEAD" +msgstr "សេវាកម្មសម្របសម្រួលនេះមិនមានទេ។ សូមមើលខាងក្រោមសម្រាប់ព័ត៌មានលម្អិតបន្ថែម។ ប្រសិនបើបញ្ហានេះនៅតែបន្តកើតមាន សូមទាក់ទងមកយើងខ្ញុំ" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "ឈប់ជាវពីបញ្ជី" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "មើលប្លុកសម្រាប់ព័ត៌មានលម #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "មើលធាតុបំបាត់កំហុស<<<<<<< HEAD" +msgstr "មើលធាតុបំបាត់កំហុស" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "មើលគណនីដែលបានបិទរបស់អ្នក #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/ko/messages.po b/src/locale/locales/ko/messages.po index 1f6dc5430..d79617233 100644 --- a/src/locale/locales/ko/messages.po +++ b/src/locale/locales/ko/messages.po @@ -98,7 +98,7 @@ 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 {팔로우 중}}<<<<<<< HEAD" +msgstr "{0, plural, other {팔로우 중}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, other {좋아요}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, other {게시물}}<<<<<<< HEAD" +msgstr "{0, plural, other {게시물}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "접근성" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "접근성 설정<<<<<<< HEAD" +msgstr "접근성 설정" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "접근성 설정<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "계정<<<<<<< HEAD" +msgstr "계정" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "리스트로 계정 뮤트됨" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "계정 옵션<<<<<<< HEAD" +msgstr "계정 옵션" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "동물 보호>>>>>>> upstream/main" +msgstr "동물 보호" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "공지사항" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky의 인증 기능 소개<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky의 인증 기능 소개" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "누구나>>>>>>> upstream/main" +msgstr "누구나" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "앱 비밀번호 이름은 4자 이상이어야 합니다" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "앱 비밀번호<<<<<<< HEAD" +msgstr "앱 비밀번호" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "일시 정지 이의신청" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "이 결정에 이의신청<<<<<<< HEAD" +msgstr "이 결정에 이의신청" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "기본 추천 피드 적용하기" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "풀 리퀘스트 적용<<<<<<< HEAD" +msgstr "풀 리퀘스트 적용" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "알고리즘에 주제 지정" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "8자 이상<<<<<<< HEAD" +msgstr "8자 이상" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "아래 항목을 작성하여 연령 확인 절차를 시작하세요." #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "생년월일<<<<<<< HEAD" +msgstr "생년월일" #: 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." @@ -1446,7 +1446,7 @@ msgstr "계정 차단" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "차단 및 삭제<<<<<<< HEAD" +msgstr "차단 및 삭제" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "사용자 차단" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "사용자 차단<<<<<<< HEAD" +msgstr "사용자 차단" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "차단하더라도 내 계정에 라벨이 붙는 것은 막지 못하지만, 이 계정이 내 스레드에 답글을 달거나 나와 상호작용하는 것은 중지됩니다." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "재활성화 취소 및 로그아웃" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "검색 취소<<<<<<< HEAD" +msgstr "검색 취소" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "아동 성착취물>>>>>>> upstream/main" +msgstr "아동 성착취물" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "작성자 DID 복사" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "코드 복사<<<<<<< HEAD" +msgstr "코드 복사" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "사용자 지정" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "사용자 지정 옵션<<<<<<< HEAD" +msgstr "사용자 지정 옵션" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "이메일 2단계 인증 끄기" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "햅틱 피드백 끄기<<<<<<< HEAD<<<<<<< HEAD" +msgstr "햅틱 피드백 끄기" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "답글을 완전히 비활성화>>>>>>> upstream/main" +msgstr "답글을 완전히 비활성화" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ msgstr "Bluesky 다운로드" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR 파일 다운로드<<<<<<< HEAD" +msgstr "CAR 파일 다운로드" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "신상 털기>>>>>>> upstream/main" +msgstr "신상 털기" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "모두" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "기타<<<<<<< HEAD" +msgstr "기타" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "완료" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "건강<<<<<<< HEAD=======" +msgstr "건강" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "팔로우 중" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "팔로우 중<<<<<<< HEAD" +msgstr "팔로우 중" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "분실" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "피드를 자유롭게<<<<<<< HEAD" +msgstr "피드를 자유롭게" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "프로필에 얼굴 달기<<<<<<< HEAD" +msgstr "프로필에 얼굴 달기" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "그루밍 또는 포식 행위" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "해킹 또는 시스템 공격>>>>>>> upstream/main" +msgstr "해킹 또는 시스템 공격" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "코드가 있나요? <0>이곳을 클릭하세요." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "문제가 있나요?<<<<<<< HEAD" +msgstr "문제가 있나요?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "사용자 지정 옵션 숨기기<<<<<<< HEAD<<<<<<< HEAD" +msgstr "사용자 지정 옵션 숨기기" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "핸들이나 이메일을 변경하려는 경우 비활성화하기 전에 변경하세요." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "이미지를 저장했습니다" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "사진 보관함에 대한 접근 권한이 부여되지 않으면 이미지를 저장할 수 없습니다.<<<<<<< HEAD" +msgstr "사진 보관함에 대한 접근 권한이 부여되지 않으면 이미지를 저장할 수 없습니다." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "사칭>>>>>>> upstream/main" +msgstr "사칭" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "인앱, 푸시, 모두" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "인앱, 푸시, 내가 팔로우하는 사용자<<<<<<< HEAD" +msgstr "인앱, 푸시, 내가 팔로우하는 사용자" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "계정을 삭제하기 위해 비밀번호를 입력합니다" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "이메일로 전송된 코드를 입력합니다<<<<<<< HEAD<<<<<<< HEAD" +msgstr "이메일로 전송된 코드를 입력합니다" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0}(이)가 라벨 지정함." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "작성자가 라벨 지정함.<<<<<<< HEAD" +msgstr "작성자가 라벨 지정함." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "더 알아보기" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "연령 확인에 대해 자세히 알아보기<<<<<<< HEAD" +msgstr "연령 확인에 대해 자세히 알아보기" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Bluesky에서 공개되는 항목에 대해 자세히 알아보세요." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<0>계정 설정에서 자세히 알아보세요.<<<<<<< HEAD" +msgstr "<0>계정 설정에서 자세히 알아보세요." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "내 재게시물의 좋아요" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "내 재게시물의 좋아요 알림<<<<<<< HEAD" +msgstr "내 재게시물의 좋아요 알림" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "메시지 옵션" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "메시지<<<<<<< HEAD" +msgstr "메시지" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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 "검토자가 콘텐츠에 일반 경고를 설정했습니다.<<<<<<< HEAD" +msgstr "검토자가 콘텐츠에 일반 경고를 설정했습니다." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "내 피드" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "이름<<<<<<< HEAD" +msgstr "이름" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "이미지 없음" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "아직 좋아요 없음<<<<<<< HEAD" +msgstr "아직 좋아요 없음" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "지금" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "나체<<<<<<< HEAD" +msgstr "나체" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "비밀번호 재설정 양식을 엽니다" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "게시물 언어 설정을 엽니다<<<<<<< HEAD" +msgstr "게시물 언어 설정을 엽니다" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +6398,7 @@ msgstr "기타 성폭력 콘텐츠" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "기타 폭력적인 콘텐츠>>>>>>> upstream/main" +msgstr "기타 폭력적인 콘텐츠" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ msgstr "@{0} 님을 팔로우하는 사용자" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "내가 팔로우하는 사용자<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "내가 팔로우하는 사용자" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "내가 팔로우하는 사용자" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "내가 멘션한 사용자>>>>>>> upstream/main" +msgstr "내가 멘션한 사용자" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "게시물을 삭제했습니다" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "게시물을 업로드하지 못했습니다. 인터넷 연결을 확인한 후 다시 시도해 주세요.<<<<<<< HEAD" +msgstr "게시물을 업로드하지 못했습니다. 인터넷 연결을 확인한 후 다시 시도해 주세요." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr "쉿! 이 게시물과 상호작용할 수 있는 사용자를 편집할 수 있어요.>>>>>>> upstream/main" +msgstr "쉿! 이 게시물과 상호작용할 수 있는 사용자를 편집할 수 있어요." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "게시물 인용 비활성화됨" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "인용<<<<<<< HEAD" +msgstr "인용" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "내가 재게시함" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "재게시<<<<<<< HEAD" +msgstr "재게시" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "온보딩 상태 초기화" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "비밀번호 재설정<<<<<<< HEAD" +msgstr "비밀번호 재설정" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "과학<<<<<<< HEAD" +msgstr "과학" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "생년월일 설정" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "새 비밀번호 설정<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "새 비밀번호 설정" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr "내 게시물에 답글을 달 수 있는 사용자 그룹을 설정하세요>>>>>>> upstream/main" +msgstr "내 게시물에 답글을 달 수 있는 사용자 그룹을 설정하세요" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "답글 표시" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "답글 표시 형식<<<<<<< HEAD" +msgstr "답글 표시 형식" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "경고 표시" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "경고 표시 및 피드에서 필터링<<<<<<< HEAD" +msgstr "경고 표시 및 피드에서 필터링" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "나를 위한 추천" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "외설적<<<<<<< HEAD" +msgstr "외설적" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "이용약관" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "서비스 이용약관<<<<<<< HEAD" +msgstr "서비스 이용약관" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "서버에 연결하는 동안 문제가 발생했습니다. 인터넷 #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "알림을 가져오는 동안 문제가 발생했습니다. 다시 시도하려면 이곳을 탭하세요.<<<<<<< HEAD" +msgstr "알림을 가져오는 동안 문제가 발생했습니다. 다시 시도하려면 이곳을 탭하세요." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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에 신규 사용자가 몰리고 있습니다! 최대한 빨리 계정을 활성화하겠습니다.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky에 신규 사용자가 몰리고 있습니다! 최대한 빨리 계정을 활성화하겠습니다." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "내 기본 설정>>>>>>> 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 "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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 "이 검토 서비스는 사용할 수 없습니다. 자세한 내용은 아래를 참조하세요. 이 문제가 지속되면 문의해 주세요.<<<<<<< HEAD" +msgstr "이 검토 서비스는 사용할 수 없습니다. 자세한 내용은 아래를 참조하세요. 이 문제가 지속되면 문의해 주세요." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "재게시 취소 ({0, plural, other {#개}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "리스트를 구독 취소했습니다" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "지원되지 않는 동영상 유형: {mimeType}<<<<<<< HEAD" +msgstr "지원되지 않는 동영상 유형: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "자세한 정보를 위해 블로그 글 보기" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "디버그 항목 보기<<<<<<< HEAD" +msgstr "디버그 항목 보기" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "내가 뮤트한 계정 보기" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "내 인증 보기<<<<<<< HEAD" +msgstr "내 인증 보기" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "폭력적이거나 위협적인 콘텐츠>>>>>>> upstream/main" +msgstr "폭력적이거나 위협적인 콘텐츠" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "이 사용자를 검토해야 하는 이유는 무엇인가요?" #: src/components/dms/AfterReportDialog.tsx:49 msgid "Would you like to block this user and/or delete this conversation?" -msgstr "이 사용자를 차단하거나 이 대화를 삭제하시겠습니까?>>>>>>> upstream/main" +msgstr "이 사용자를 차단하거나 이 대화를 삭제하시겠습니까?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/ne/messages.po b/src/locale/locales/ne/messages.po index 0bf3b24e2..07530f8c5 100644 --- a/src/locale/locales/ne/messages.po +++ b/src/locale/locales/ne/messages.po @@ -98,7 +98,7 @@ 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 {अनुगमन गरिरहेका}}<<<<<<< HEAD" +msgstr "{0, plural, one {अनुगमन गरिरहेको} other {अनुगमन गरिरहेका}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {मन पराइएको} other {मन परा #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {पोष्ट} other {पोष्टहरू}}<<<<<<< HEAD" +msgstr "{0, plural, one {पोष्ट} other {पोष्टहरू}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "पहुँचयोग्यता" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "पहुँचयोग्यता सेटिङ्स<<<<<<< HEAD" +msgstr "पहुँचयोग्यता सेटिङ्स" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "पहुँचयोग्यता सेटिङ्स<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "खाता<<<<<<< HEAD" +msgstr "खाता" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "सूचीद्वारा खाता म्यूट गरिए #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "खाताको विकल्पहरू<<<<<<< HEAD" +msgstr "खाताको विकल्पहरू" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "एप पासवर्ड नाम कम्तिमा ४ वर #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "एप पासवर्डहरू<<<<<<< HEAD" +msgstr "एप पासवर्डहरू" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "यो निर्णयको अपील गर्नुहोस्।<<<<<<< HEAD" +msgstr "यो निर्णयको अपील गर्नुहोस्।" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "डिफल्ट सिफारिस गरिएका फिडह #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "जन्मदिन<<<<<<< HEAD" +msgstr "जन्मदिन" #: 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." @@ -1446,7 +1446,7 @@ msgstr "खाताहरू ब्लक गर्नुहोस्" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "ब्लकले तपाईंको खातामा लेबलहरू लागू हुनबाट रोक्दैन, तर यस खाताले तपाईंको थ्रेडहरूमा उत्तर दिन वा तपाईंसँग अन्तरक्रिया गर्न रोक्नेछ।" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "पुस्तकहरू" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "पुनः सक्रियता रद्द गर्नुहो #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "खोजी रद्द गर्नुहोस्<<<<<<< HEAD" +msgstr "खोजी रद्द गर्नुहोस्" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "कोड प्रतिलिपि गर्नुहोस्<<<<<<< HEAD" +msgstr "कोड प्रतिलिपि गर्नुहोस्" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "अनुकूलित" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "डिबग प्यानल" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "इमेल 2FA अक्षम गर्नुहोस्" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "ह्याप्टिक प्रतिक्रिया अक्षम गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD" +msgstr "ह्याप्टिक प्रतिक्रिया अक्षम गर्नुहोस्" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "Bluesky डाउनलोड गर्नुहोस्" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "CAR फाइल डाउनलोड गर्नुहोस्<<<<<<< HEAD" +msgstr "CAR फाइल डाउनलोड गर्नुहोस्" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "सबै जना" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "समाप्त" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "फिटनेस<<<<<<< HEAD=======" +msgstr "फिटनेस" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "अनुसरण गर्दै" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "अनुसरण गर्दै<<<<<<< HEAD" +msgstr "अनुसरण गर्दै" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "बिर्सनुभयो?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "आफ्नो प्रोफाइललाई अनुहार दिनुहोस्<<<<<<< HEAD" +msgstr "आफ्नो प्रोफाइललाई अनुहार दिनुहोस्" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "ह्याप्टिक्स" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "समस्या भइरहेको छ?<<<<<<< HEAD" +msgstr "समस्या भइरहेको छ?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "यदि तपाईं आफ्नो ह्यान्डल वा इमेल परिवर्तन गर्न प्रयास गरिरहनु भएको छ भने, निष्क्रिय गर्नु अघि गर्नुहोस्।" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "खाता मेटाउनको लागि पासवर्ड #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "तपाईंलाई इमेल गरिएका कोड प्रविष्ट गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD" +msgstr "तपाईंलाई इमेल गरिएका कोड प्रविष्ट गर्नुहोस्" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0} द्वारा लेबल गरिएको।" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "लेखकद्वारा लेबल गरिएको।<<<<<<< HEAD" +msgstr "लेखकद्वारा लेबल गरिएको।" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "थप जान्नुहोस्" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "ब्लूस्काईमा सार्वजनिक हुन #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "सन्देशहरू<<<<<<< HEAD" +msgstr "सन्देशहरू" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "मोडरेटरले सामग्रीमा सामान्य चेतावनी सेट गर्ने निर्णय गरेका छन्।<<<<<<< HEAD" +msgstr "मोडरेटरले सामग्रीमा सामान्य चेतावनी सेट गर्ने निर्णय गरेका छन्।" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "मेरो फीडहरू" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "नाम<<<<<<< HEAD" +msgstr "नाम" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "अहिलेसम्म कुनै रुचिहरू छैन<<<<<<< HEAD" +msgstr "अहिलेसम्म कुनै रुचिहरू छैन" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "अहिले" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "नग्नता<<<<<<< HEAD" +msgstr "नग्नता" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "पासवर्ड रिसेट फारम खोल्नुह #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "@{0} लाई अनुसरण गर्ने व्यक्ति" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "पोस्ट मेटियो" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "पोस्ट अपलोड गर्न असफल भयो। कृपया तपाईंको इन्टरनेट कनेक्शन जाँच गर्नुहोस् र पुनः प्रयास गर्नुहोस्।<<<<<<< HEAD" +msgstr "पोस्ट अपलोड गर्न असफल भयो। कृपया तपाईंको इन्टरनेट कनेक्शन जाँच गर्नुहोस् र पुनः प्रयास गर्नुहोस्।" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "प्रोफाइल अद्यावधिक गरियो।" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "उद्धरण पोस्टहरू अक्षम गरिए #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "उद्धरण।<<<<<<< HEAD" +msgstr "उद्धरण।" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "तपाईँद्वारा पुनःपोस्ट गरि #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "प्रारम्भिक अवस्थालाई रिसे #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "पासवर्ड रिसेट गर्नुहोस्<<<<<<< HEAD" +msgstr "पासवर्ड रिसेट गर्नुहोस्" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "विज्ञान<<<<<<< HEAD" +msgstr "विज्ञान" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "जन्म मिति सेट गर्नुहोस्" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "नयाँ पासवर्ड सेट गर्नुहोस्<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "नयाँ पासवर्ड सेट गर्नुहोस्" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "उत्तरहरू देखाउनुहोस्" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "चेतावनी देखाउनुहोस्" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "चेतावनी देखाउनुहोस् र फीडबाट फिल्टर गर्नुहोस्<<<<<<< HEAD" +msgstr "चेतावनी देखाउनुहोस् र फीडबाट फिल्टर गर्नुहोस्" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "स्प्याम" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "तपाईंका लागि सुझाव गरिएको" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "सुझावात्मक<<<<<<< HEAD" +msgstr "सुझावात्मक" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "नियमहरू" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "सेवाका नियमहरू<<<<<<< HEAD" +msgstr "सेवाका नियमहरू" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "सर्भरलाई सम्पर्क गर्न समस् #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "सूचनाहरू प्राप्त गर्न समस्या आयो। पुन: प्रयास गर्न यहाँ ट्याप गर्नुहोस्।<<<<<<< HEAD" +msgstr "सूचनाहरू प्राप्त गर्न समस्या आयो। पुन: प्रयास गर्न यहाँ ट्याप गर्नुहोस्।" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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" +msgstr "ब्लूस्काईमा नयाँ प्रयोगकर्ताहरूको भीड भएको छ! हामी तपाईंको खाता सकेसम्म चाँडो सक्रिय गर्नेछौं।" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "यो मोडरेशन सेवा उपलब्ध छैन। थप विवरणको लागि तल हेर्नुहोस्। यदि यो समस्या जारी रहन्छ भने, हामीलाई सम्पर्क गर्नुहोस्।<<<<<<< HEAD" +msgstr "यो मोडरेशन सेवा उपलब्ध छैन। थप विवरणको लागि तल हेर्नुहोस्। यदि यो समस्या जारी रहन्छ भने, हामीलाई सम्पर्क गर्नुहोस्।" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "सूचीबाट सदस्यता समाप्त गरि #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "अधिक जानकारीको लागि ब्लगपो #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "डिबग प्रविष्टि हेर्नुहोस्<<<<<<< HEAD" +msgstr "डिबग प्रविष्टि हेर्नुहोस्" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "तपाईंका म्युट गरिएको खाता #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/nl/messages.po b/src/locale/locales/nl/messages.po index 927d7c117..e49b3e53f 100644 --- a/src/locale/locales/nl/messages.po +++ b/src/locale/locales/nl/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {volgend} other {volgend}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {bericht} other {berichten}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Toegankelijkheid" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Toegankelijkheidsinstellingen<<<<<<< HEAD" +msgstr "Toegankelijkheidsinstellingen" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Toegankelijkheidsinstellingen<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Account<<<<<<< HEAD" +msgstr "Account" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Account genegeerd door lijst" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Accountopties<<<<<<< HEAD" +msgstr "Accountopties" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Nieuw: verificatie op Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Nieuw: verificatie op Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "App-wachtwoorden" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Bezwaar maken tegen deze beslissing" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Standaard aanbevolen feeds gebruiken" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Onderwerp voor algoritme toewijzen" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Verjaardag<<<<<<< HEAD" +msgstr "Verjaardag" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Accounts blokkeren" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blokkeren en verwijderen<<<<<<< HEAD" +msgstr "Blokkeren en verwijderen" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Gebruiker blokkeren" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Gebruiker blokkeren<<<<<<< HEAD" +msgstr "Gebruiker blokkeren" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Boeken" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Heractivering annuleren en afmelden" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Zoeken annuleren<<<<<<< HEAD" +msgstr "Zoeken annuleren" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Code kopiëren<<<<<<< HEAD" +msgstr "Code kopiëren" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Gepersonaliseerd" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Aanpassingsopties<<<<<<< HEAD" +msgstr "Aanpassingsopties" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Debugpaneel" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Uitschakelen voelbare feedback" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "CAR-bestand downloaden" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Iedereen" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Voltooien" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Volgend" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Volgend<<<<<<< HEAD" +msgstr "Volgend" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Vergeten?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Geef je profiel een gezicht<<<<<<< HEAD" +msgstr "Geef je profiel een gezicht" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptische feedback" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Heb je een code? <0>Klik hier." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Heb je problemen?<<<<<<< HEAD" +msgstr "Heb je problemen?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Aanpassingsopties verbergen<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Aanpassingsopties verbergen" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Als je jouw handle of e-mailadres probeert te wijzigen, doe dit dan voordat je deactiveert." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Vul de code in die naar je is gemaild" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Gelabeld door {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Gelabeld door de auteur.<<<<<<< HEAD" +msgstr "Gelabeld door de auteur." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Leer meer" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Leer meer over wat openbaar is op Bluesky." #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Berichtopties" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Privéberichten<<<<<<< HEAD" +msgstr "Privéberichten" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "De moderator heeft ervoor gekozen om een algemene waarschuwing in te stellen voor de inhoud." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mijn feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Naam<<<<<<< HEAD" +msgstr "Naam" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Nog geen vind-ik-leuks<<<<<<< HEAD" +msgstr "Nog geen vind-ik-leuks" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Bloot<<<<<<< HEAD" +msgstr "Bloot" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Bericht kan niet worden geüpload. Controleer je internetverbinding en probeer het opnieuw." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profiel bijgewerkt" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citaatberichten uitgeschakeld" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citaten<<<<<<< HEAD" +msgstr "Citaten" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Herplaatst door jou" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Introductie-status opnieuw instellen" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Wachtwoord opnieuw instellen<<<<<<< HEAD" +msgstr "Wachtwoord opnieuw instellen" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Wetenschap<<<<<<< HEAD" +msgstr "Wetenschap" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Geboortedatum instellen" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Nieuw wachtwoord instellen<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Nieuw wachtwoord instellen" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Antwoorden tonen" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Waarschuwing tonen" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Waarschuwing en filter uit feeds tonen<<<<<<< HEAD" +msgstr "Waarschuwing en filter uit feeds tonen" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Aanbevolen voor jou" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Suggestief<<<<<<< HEAD" +msgstr "Suggestief" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Voorwaarden" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Servicevoorwaarden<<<<<<< HEAD" +msgstr "Servicevoorwaarden" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Er is een probleem opgetreden bij het verbinden met de server. Controlee #: 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.<<<<<<< HEAD" +msgstr "Er is een probleem opgetreden bij het ophalen van meldingen. Tik hier om het opnieuw te proberen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Er is een stormloop van nieuwe gebruikers naar Bluesky! We activeren je account zo snel mogelijk." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Deze moderatieservice is niet beschikbaar. Zie hieronder voor meer details. Neem contact met ons op als dit probleem zich blijft voordoen." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Uitgeschreven voor lijst" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Bekijk blogpost voor meer details" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Debug-item bekijken<<<<<<< HEAD" +msgstr "Debug-item bekijken" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Je genegeerde accounts bekijken" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/pl/messages.po b/src/locale/locales/pl/messages.po index d953ef71d..245922549 100644 --- a/src/locale/locales/pl/messages.po +++ b/src/locale/locales/pl/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {obserwowany} other {obserwowanych}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {wpis} few {wpisy} other {wpisów}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Ułatwienia dostępu" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Ustawienia ułatwień dostępu<<<<<<< HEAD" +msgstr "Ustawienia ułatwień dostępu" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Ustawienia ułatwień dostępu<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto<<<<<<< HEAD" +msgstr "Konto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Konto zostało wyciszone za pomocą listy" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Ustawienia konta<<<<<<< HEAD" +msgstr "Ustawienia konta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Hasła aplikacji" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Odwołaj się od tej decyzji" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Zastosuj domyślne kanały polecane" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Data urodzenia<<<<<<< HEAD" +msgstr "Data urodzenia" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blokuj konta" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Zablokuj i usuń<<<<<<< HEAD" +msgstr "Zablokuj i usuń" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Zablokuj osobę" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Zablokuj osobę<<<<<<< HEAD" +msgstr "Zablokuj osobę" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Blokowanie nie przeszkodzi w umieszczaniu ostrzeżeń na twoim koncie, ale uniemożliwi komentowanie twoich wpisów lub wchodzenie z tobą w interakcje." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Książki" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Anuluj reaktywację i wyloguj się" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Anuluj wyszukiwanie<<<<<<< HEAD" +msgstr "Anuluj wyszukiwanie" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Skopiuj DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiuj kod<<<<<<< HEAD" +msgstr "Kopiuj kod" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Niestandardowe" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Panel debugowania" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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ę<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Wyłącz haptykę" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Pobierz plik CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Każdy" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Ukończ" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Aktywność fizyczna<<<<<<< HEAD=======" +msgstr "Aktywność fizyczna" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Obserwujesz" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Obserwujesz<<<<<<< HEAD" +msgstr "Obserwujesz" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Nie pamiętasz?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Zmień wygląd swojego profilu<<<<<<< HEAD" +msgstr "Zmień wygląd swojego profilu" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Haptyka" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Masz problem?<<<<<<< HEAD" +msgstr "Masz problem?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Jeśli próbujesz zmienić swoją nazwę lub adres email, zrób to przed dezaktywacją." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Wprowadź kod, który został wysłany na twój adres email" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Oznaczone przez {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Oznaczone przez autora.<<<<<<< HEAD" +msgstr "Oznaczone przez autora." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Dowiedz się więcej" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Wiadomości<<<<<<< HEAD" +msgstr "Wiadomości" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderator postanowił ustawić ogólne ostrzeżenie dotyczące zawartości." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Moje kanały" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nazwa<<<<<<< HEAD" +msgstr "Nazwa" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Brak polubień<<<<<<< HEAD" +msgstr "Brak polubień" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Teraz" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nagość<<<<<<< HEAD" +msgstr "Nagość" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Zmień hasło" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Nie udało się opublikować wpisu. Sprawdź swoje połączenie internetowe i spróbuj ponownie." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Profil został zaktualizowany" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ 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<<<<<<< HEAD" +msgstr "Cytaty" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Repostowane przez ciebie" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Zacznij od nowa" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Zresetuj hasło<<<<<<< HEAD" +msgstr "Zresetuj hasło" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Nauka<<<<<<< HEAD" +msgstr "Nauka" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Ustaw datę urodzenia" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ustaw nowe hasło<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Ustaw nowe hasło" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Pokaż komentarze" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Pokaż komentarze jako<<<<<<< HEAD" +msgstr "Pokaż komentarze jako" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Pokaż ostrzeżenie i odfiltruj z kanałów" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Proponowane dla ciebie" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestywne<<<<<<< HEAD" +msgstr "Sugestywne" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Regulamin" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Regulamin<<<<<<< HEAD" +msgstr "Regulamin" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Wystąpił problem podczas łączenia z serwerem, sprawdź połączenie #: 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.<<<<<<< HEAD" +msgstr "Wystąpił problem podczas wczytywania powiadomień. Kliknij tutaj, aby spróbować ponownie." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Do Bluesky dołączyło wiele nowych osób! Twoje konto zostanie aktywowane tak szybko, jak to możliwe." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Cofnij repost ({0, plural, one {# repost} few {# reposty} other {# repostów}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Nie subskrybujesz już listy" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Więcej informacji można znaleźć na blogu" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Wyświetl dziennik systemowy<<<<<<< HEAD" +msgstr "Wyświetl dziennik systemowy" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Wyświetl wyciszone konta" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/pt-BR/messages.po b/src/locale/locales/pt-BR/messages.po index b0b0828fe..76b486beb 100644 --- a/src/locale/locales/pt-BR/messages.po +++ b/src/locale/locales/pt-BR/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {seguindo} other {seguindo}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {postagem} other {postagens}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Acessibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Acessibilidade<<<<<<< HEAD" +msgstr "Acessibilidade" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Acessibilidade<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta<<<<<<< HEAD" +msgstr "Conta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Conta silenciada pela lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opções da conta<<<<<<< HEAD" +msgstr "Opções da conta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bem-estar animal>>>>>>> upstream/main" +msgstr "Bem-estar animal" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +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" +msgstr "Anunciando verificação no Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Senhas de aplicativo" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Recorrer desta decisão" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Utilizar feeds recomendados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplicar Pull Request<<<<<<< HEAD" +msgstr "Aplicar Pull Request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "No mínimo 8 caracteres" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Aniversário" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e excluir<<<<<<< HEAD" +msgstr "Bloquear e excluir" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloquear usuário" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear usuário<<<<<<< HEAD" +msgstr "Bloquear usuário" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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ê." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Cancelar reativação e desconectar" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar pesquisa<<<<<<< HEAD" +msgstr "Cancelar pesquisa" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Copiar DID do autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código<<<<<<< HEAD" +msgstr "Copiar código" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opções de personalização<<<<<<< HEAD" +msgstr "Opções de personalização" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2653,7 +2653,7 @@ msgstr "Painel de depuração" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desativar feedback tátil" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Baixar arquivo CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Demais itens<<<<<<< HEAD" +msgstr "Demais itens" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Finalizar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Atividades físicas<<<<<<< HEAD=======" +msgstr "Atividades físicas" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Seguindo" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Seguindo<<<<<<< HEAD" +msgstr "Seguindo" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Esqueceu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Libere o seu feed<<<<<<< HEAD" +msgstr "Libere o seu feed" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Dê uma cara nova pro seu perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4424,7 +4424,7 @@ msgstr "Tem um código? <0>Clique aqui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Precisa de ajuda?<<<<<<< HEAD" +msgstr "Precisa de ajuda?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar opções de personalização<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ocultar opções de personalização" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Se você estiver tentando alterar seu nome de usuário ou e-mail, faça isso antes de desativar." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Imagens não podem ser salvas a menos que seja concedida permissão para acessar sua galeria de fotos." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "No app, No dispositivo, Pessoas que você segue" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Insira o código que você recebeu por e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Rotulado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Rotulado pelo autor.<<<<<<< HEAD" +msgstr "Rotulado pelo autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "Saiba mais sobre a verificação de idade" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Saiba mais nas suas <0>configurações da conta." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Curtidas das suas repostagens" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificações de curtidas das suas repostagens<<<<<<< HEAD" +msgstr "Notificações de curtidas das suas repostagens" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Opções de mensagem" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensagens<<<<<<< HEAD" +msgstr "Mensagens" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "O moderador escolheu aplicar um aviso geral neste conteúdo." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Meus Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome<<<<<<< HEAD" +msgstr "Nome" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Sem imagem" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Sem curtidas ainda<<<<<<< HEAD" +msgstr "Sem curtidas ainda" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez<<<<<<< HEAD" +msgstr "Nudez" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Abre configurações de idioma da postagem" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6386,7 +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" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:231 msgid "Other network rule-breaking" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Pessoas que eu sigo" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Falha ao enviar a postagem. Por favor verifique sua conexão de internet e tente novamente." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Perfil atualizado" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citações desabilitadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citações<<<<<<< HEAD" +msgstr "Citações" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Repostado por você" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repostagens<<<<<<< HEAD" +msgstr "Repostagens" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Redefinir tutoriais" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Redefinir senha<<<<<<< HEAD" +msgstr "Redefinir senha" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciência<<<<<<< HEAD" +msgstr "Ciência" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Definir data de nascimento" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir uma nova senha<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Definir uma nova senha" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Mostrar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar respostas como<<<<<<< HEAD" +msgstr "Mostrar respostas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Mostrar aviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar aviso e filtrar dos feeds<<<<<<< HEAD" +msgstr "Mostrar aviso e filtrar dos feeds" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Sugeridos para você" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo<<<<<<< HEAD" +msgstr "Sugestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Termos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termos de Serviço<<<<<<< HEAD" +msgstr "Termos de Serviço" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Houve um problema ao comunicar com o servidor, por favor verifique sua c #: 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.<<<<<<< HEAD" +msgstr "Tivemos um problema ao carregar notificações. Toque aqui para tentar de novo." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Muitos usuários estão tentando acessar o Bluesky! Ativaremos sua conta assim que possível." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Este serviço de moderação está indisponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contato." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Desfazer repostagem ({0, plural, one {# repostagem} other {# repostagens}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Formato de vídeo não suportado: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Veja a postagem no blog para mais detalhes" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver depuração<<<<<<< HEAD" +msgstr "Ver depuração" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Veja suas contas silenciadas" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver suas verificações<<<<<<< HEAD" +msgstr "Ver suas verificações" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Conteúdo violento ou ameaçador>>>>>>> upstream/main" +msgstr "Conteúdo violento ou ameaçador" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" diff --git a/src/locale/locales/pt-PT/messages.po b/src/locale/locales/pt-PT/messages.po index d59581ff3..d3dd02f10 100644 --- a/src/locale/locales/pt-PT/messages.po +++ b/src/locale/locales/pt-PT/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {a seguir} other {a seguir}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {publicação} other {publicações}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Acessibilidade" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Definições de acessibilidade<<<<<<< HEAD" +msgstr "Definições de acessibilidade" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Definições de acessibilidade<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Conta<<<<<<< HEAD" +msgstr "Conta" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Conta silenciada pela Lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Definições da conta<<<<<<< HEAD" +msgstr "Definições da conta" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bem-estar animal>>>>>>> upstream/main" +msgstr "Bem-estar animal" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Comunicado" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunciando verificação no Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Anunciando verificação no Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Todos>>>>>>> upstream/main" +msgstr "Todos" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Palavras-passe da Aplicação" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Recorrer desta decisão" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Utilizar feeds recomendados" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "Aplicar Pull Request<<<<<<< HEAD" +msgstr "Aplicar Pull Request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "No mínimo 8 caracteres" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Aniversário" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Bloquear contas" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Bloquear e eliminar<<<<<<< HEAD" +msgstr "Bloquear e eliminar" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Bloquear utilizador" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Bloquear Utilizador<<<<<<< HEAD" +msgstr "Bloquear Utilizador" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Cancelar reativação e terminar sessão" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Cancelar pesquisa<<<<<<< HEAD" +msgstr "Cancelar pesquisa" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "Pornografia infantil (CSAM)>>>>>>> upstream/main" +msgstr "Pornografia infantil (CSAM)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Copiar DID do autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiar código<<<<<<< HEAD" +msgstr "Copiar código" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Personalizado" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Definições de personalização<<<<<<< HEAD" +msgstr "Definições de personalização" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Desativar feedback tátil" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Desativar respostas completamente>>>>>>> upstream/main" +msgstr "Desativar respostas completamente" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Transferir ficheiro CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Doxxing>>>>>>> upstream/main" +msgstr "Doxxing" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Todos" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Tudo o resto<<<<<<< HEAD" +msgstr "Tudo o resto" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Terminar" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "A seguir" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "A seguir<<<<<<< HEAD" +msgstr "A seguir" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Esqueceu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Liberte o seu feed<<<<<<< HEAD" +msgstr "Liberte o seu feed" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Dê um rosto ao seu perfil<<<<<<< HEAD" +msgstr "Dê um rosto ao seu perfil" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Tem um código? <0>Clique aqui." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Está com problemas?<<<<<<< HEAD" +msgstr "Está com problemas?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ocultar definições de personalização<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ocultar definições de personalização" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Se está a tentar alterar o seu nome de utilizador ou e-mail, faça-o antes de desativar." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Imagens não podem ser guardadas se não tiver sido concedida permissão para aceder à sua galeria de fotos." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Impersonação>>>>>>> upstream/main" +msgstr "Impersonação" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "Na aplicação, Push, Pessoas que segue" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Introduza o código que lhe foi enviado por e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Rotulado por {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Rotulado pelo autor.<<<<<<< HEAD" +msgstr "Rotulado pelo autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "Saiba mais sobre a verificação de idade" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Saiba mais nas suas <0>definições de conta." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Notificações de gostos nas suas republicações" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Opções de mensagem" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mensagens<<<<<<< HEAD" +msgstr "Mensagens" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "O moderador optou por definir um aviso geral sobre o conteúdo." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Os Meus Feeds" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nome<<<<<<< HEAD" +msgstr "Nome" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Sem imagem" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Sem gostos ainda<<<<<<< HEAD" +msgstr "Sem gostos ainda" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Agora" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nudez<<<<<<< HEAD" +msgstr "Nudez" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Abre as definições de idioma da publicação" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Pessoas que eu sigo" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Pessoas que segue" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Pessoas que menciona>>>>>>> upstream/main" +msgstr "Pessoas que menciona" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Falha no carregamento da publicação. Por favor, verifique a sua conexão à internet e tente novamente." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citações desativadas" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citações<<<<<<< HEAD" +msgstr "Citações" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Republicado por si" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Republicações<<<<<<< HEAD" +msgstr "Republicações" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Redefinir estado da introdução" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Redefinir palavra-passe<<<<<<< HEAD" +msgstr "Redefinir palavra-passe" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Ciência<<<<<<< HEAD" +msgstr "Ciência" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Definir data de nascimento" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Definir nova palavra-passe<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Definir nova palavra-passe" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr "Defina exatamente que grupos de pessoas podem responder à sua publicação>>>>>>> upstream/main" +msgstr "Defina exatamente que grupos de pessoas podem responder à sua publicação" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Mostrar respostas" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Mostrar respostas como<<<<<<< HEAD" +msgstr "Mostrar respostas como" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Mostrar aviso" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Mostrar aviso e filtrar de feeds<<<<<<< HEAD" +msgstr "Mostrar aviso e filtrar de feeds" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Sugerido para si" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestivo<<<<<<< HEAD" +msgstr "Sugestivo" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Termos" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termos de Serviço<<<<<<< HEAD" +msgstr "Termos de Serviço" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Ocorreu um problema ao contactar o servidor. Por favor, verifique a sua #: 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.<<<<<<< HEAD" +msgstr "Houve um problema ao obter as notificações. Toque aqui para tentar novamente." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Houve um largo influxo de novos utilizadores para o Bluesky! Iremos ativar a sua conta assim que possível." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 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" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Este serviço de moderação não está disponível. Veja mais detalhes abaixo. Se este problema persistir, entre em contacto connosco." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Reverter ({0, plural, one {# republicação} other {# republicações}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Tipo de vídeo não suportado: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Veja a publicação no blog para mais detalhes" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Ver entrada de debug<<<<<<< HEAD" +msgstr "Ver entrada de debug" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Ver as contas que silenciou" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Ver as suas verificações<<<<<<< HEAD" +msgstr "Ver as suas verificações" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Conteúdo violento ou ameaçador>>>>>>> upstream/main" +msgstr "Conteúdo violento ou ameaçador" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Por que motivo deve este utilizador ser revisto?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/ro/messages.po b/src/locale/locales/ro/messages.po index 5c5df101c..d8aad565b 100644 --- a/src/locale/locales/ro/messages.po +++ b/src/locale/locales/ro/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {urmărit} few {urmăriți} other {de urmăriți}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {postare} few {postări} other {de postări}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Accesibilitate" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Setări de accesibilitate<<<<<<< HEAD" +msgstr "Setări de accesibilitate" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Setări de accesibilitate<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Cont<<<<<<< HEAD" +msgstr "Cont" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Cont amuțit de listă" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Opțiuni cont<<<<<<< HEAD" +msgstr "Opțiuni cont" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Bunăstarea animalelor>>>>>>> upstream/main" +msgstr "Bunăstarea animalelor" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Anunț" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Anunțăm verificarea pe Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Anunțăm verificarea pe Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Oricine>>>>>>> upstream/main" +msgstr "Oricine" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Parole de aplicații" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Contestați această decizie" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Aplicați solicitarea de tragere" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "Cel puțin 8 caractere" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Zi de naștere" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blocare conturi" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blocare și ștergere<<<<<<< HEAD" +msgstr "Blocare și ștergere" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blocare utilizator" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blocare utilizator<<<<<<< HEAD" +msgstr "Blocare utilizator" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Anulați reactivarea și deconectați-vă" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Anulare căutare<<<<<<< HEAD" +msgstr "Anulare căutare" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Copiere DID autor" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Copiere cod<<<<<<< HEAD" +msgstr "Copiere cod" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Particularizat" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Opțiuni de personalizare<<<<<<< HEAD" +msgstr "Opțiuni de personalizare" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Dezactivați feedback-ul haptic" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Dezactivați răspunsurile în întregime>>>>>>> upstream/main" +msgstr "Dezactivați răspunsurile în întregime" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Descărcare fișier CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Doxxing>>>>>>> upstream/main" +msgstr "Doxxing" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Toți" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Toate celelalte<<<<<<< HEAD" +msgstr "Toate celelalte" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Finalizare" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Urmăriți" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Urmăriți<<<<<<< HEAD" +msgstr "Urmăriți" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Ați uitat parola?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Eliberați-vă fluxul<<<<<<< HEAD" +msgstr "Eliberați-vă fluxul" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Oferiți profilului dvs. o față<<<<<<< HEAD" +msgstr "Oferiți profilului dvs. o față" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ 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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Aveți un cod? <0>Faceți clic aici." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Aveți dificultăți?<<<<<<< HEAD" +msgstr "Aveți dificultăți?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ascundere opțiuni de personalizare<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ascundere opțiuni de personalizare" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Dacă încercați să vă modificați identificatorul sau adresa de e-mail, faceți acest lucru înainte de a dezactiva." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Imaginile nu pot fi salvate decât dacă se acordă permisiunea de a accesa biblioteca dvs. de fotografii." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "Impersonare>>>>>>> upstream/main" +msgstr "Impersonare" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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" +msgstr "În aplicație, Push, Persoane pe care le urmăriți" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Introduceți codul care v-a fost trimis prin e-mail" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Etichetat de {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Etichetat de autor.<<<<<<< HEAD" +msgstr "Etichetat de autor." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "Aflați mai multe despre verificarea vârstei" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Aflați mai multe în <0>setările contului." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Aprecieri pentru repostările dvs." #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notificări privind aprecierile postărilor dvs.<<<<<<< HEAD" +msgstr "Notificări privind aprecierile postărilor dvs." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Opțiuni mesaj" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesaje<<<<<<< HEAD" +msgstr "Mesaje" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderatorul a decis să seteze un avertisment general asupra acestui conținutului." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Fluxurile mele" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Nume<<<<<<< HEAD" +msgstr "Nume" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Încă nu există aprecieri" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Acum" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Nuditate<<<<<<< HEAD" +msgstr "Nuditate" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Deschide setările de limbă pentru postări" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Persoane pe care le urmăriți" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ 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>>>>>>> upstream/main" +msgstr "Persoane pe care le menționați" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Postarea nu a putut fi încărcată. Vă rugăm să vă verificați conexiunea la internet și să încercați din nou." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Postări citat dezactivate" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citate<<<<<<< HEAD" +msgstr "Citate" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Repostat de dvs." #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Repostări<<<<<<< HEAD" +msgstr "Repostări" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Resetare stare înregistrare" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Resetați parola<<<<<<< HEAD" +msgstr "Resetați parola" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Știință<<<<<<< HEAD" +msgstr "Știință" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Setați data nașterii" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Setați parola nouă<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Setați parola nouă" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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.>>>>>>> upstream/main" +msgstr "Stabiliți cu precizie grupurile de persoane care pot răspunde la postarea dvs." #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Afișați răspunsurile" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Afișați răspunsurile ca<<<<<<< HEAD" +msgstr "Afișați răspunsurile ca" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Afișează avertismente și filtrează din fluxuri" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Sugerat pentru dvs." #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Sugestiv<<<<<<< HEAD" +msgstr "Sugestiv" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Termeni" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Termenii de Serviciu<<<<<<< HEAD" +msgstr "Termenii de Serviciu" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "A apărut o problemă la contactarea serverului, vă rugăm să vă veri #: 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.<<<<<<< HEAD" +msgstr "A apărut o problemă la preluarea notificărilor. Atingeți aici pentru a încerca din nou." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Au fost o grămadă de utilizatori noi pe Bluesky! Vă vom activa contul cât mai curând posibil." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "Acestea sunt setările dvs. implicite>>>>>>> upstream/main" +msgstr "Acestea sunt setările dvs. implicite" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Acest serviciu de moderare nu este disponibil. Consultați mai jos pentru mai multe detalii. Dacă problema persistă, contactați-ne." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Refacere repostare ({0, plural, one {o repostare} few {# repostări} other {# de repostări}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Dezabonat de la listă" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Tip videoclip neacceptat: {mimeType}<<<<<<< HEAD" +msgstr "Tip videoclip neacceptat: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Vizualizați intrarea de depanare" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Vizualizați conturile dvs. amuțite" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Vizualizați-vă verificările<<<<<<< HEAD" +msgstr "Vizualizați-vă verificările" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Conținut violent sau amenințător>>>>>>> upstream/main" +msgstr "Conținut violent sau amenințător" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "De ce ar trebui revizuit acest utilizator?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/ru/messages.po b/src/locale/locales/ru/messages.po index 450064f4f..7dcb4257f 100644 --- a/src/locale/locales/ru/messages.po +++ b/src/locale/locales/ru/messages.po @@ -98,7 +98,7 @@ 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 {подписок}}<<<<<<< HEAD" +msgstr "{0, plural, one {подписка} few {подписки} other {подписок}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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 {постов}}<<<<<<< HEAD" +msgstr "{0, plural, one {пост} few {поста} other {постов}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Доступность" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Настройки Доступности<<<<<<< HEAD" +msgstr "Настройки Доступности" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Настройки Доступности<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Учётная запись<<<<<<< HEAD" +msgstr "Учётная запись" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Учётная запись игнорируется списком" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Параметры учётной записи<<<<<<< HEAD" +msgstr "Параметры учётной записи" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Представляем верификацию на Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Представляем верификацию на Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "Имена паролей приложений должны состоя #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Пароли приложений<<<<<<< HEAD" +msgstr "Пароли приложений" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "Обжаловать приостановку" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Обжаловать это решение<<<<<<< HEAD" +msgstr "Обжаловать это решение" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Применить рекомендуемые по умолчанию л #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Назначьте тему для алгоритма" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Как минимум 8 символов<<<<<<< HEAD" +msgstr "Как минимум 8 символов" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "Начните процесс проверки возраста, зап #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Дата рождения<<<<<<< HEAD" +msgstr "Дата рождения" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Заблокировать учётные записи" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Заблокировать и удалить<<<<<<< HEAD" +msgstr "Заблокировать и удалить" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Заблокировать пользователя" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Заблокировать пользователя<<<<<<< HEAD" +msgstr "Заблокировать пользователя" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Блокировка не помешает добавлять метки на вашу учётную запись, но она остановит возможность этой учётной записи комментировать ваши посты или взаимодействовать с вами." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Книги" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "Отменить реактивацию и выйти из систем #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Отменить поиск<<<<<<< HEAD" +msgstr "Отменить поиск" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "Копировать DID автора" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Копировать код<<<<<<< HEAD" +msgstr "Копировать код" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Пользовательский" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Панель отладки" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "Отключить 2FA по электронной почте" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Отключить тактильную обратную связь<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Отключить тактильную обратную связь" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "Скачать Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Скачать CAR файл<<<<<<< HEAD" +msgstr "Скачать CAR файл" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Все" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Финиш" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Фитнес<<<<<<< HEAD=======" +msgstr "Фитнес" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Подписки" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Подписки<<<<<<< HEAD" +msgstr "Подписки" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Забыли пароль?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Освободите свою ленту<<<<<<< HEAD" +msgstr "Освободите свою ленту" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Придайте своему профилю лицо<<<<<<< HEAD" +msgstr "Придайте своему профилю лицо" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Тактильные ощущения" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "Есть код? <0>Нажмите здесь." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Возникли проблемы?<<<<<<< HEAD" +msgstr "Возникли проблемы?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Если вы хотите изменить свой псевдоним или электронную почту, сделайте это до деактивации." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "Изображение сохранено" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "Изображения не могут быть сохранены, если у приложения нет разрешения на доступ к галерее.<<<<<<< HEAD" +msgstr "Изображения не могут быть сохранены, если у приложения нет разрешения на доступ к галерее." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "В приложении, Push, Все" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "В приложении, Push, Люди, на которых вы подписаны<<<<<<< HEAD" +msgstr "В приложении, Push, Люди, на которых вы подписаны" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "Введите пароль для удаления учётной за #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Введите код, который был отправлен вам по электронной почте<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Введите код, который был отправлен вам по электронной почте" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Отмечен {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Метка добавлена автором.<<<<<<< HEAD" +msgstr "Метка добавлена автором." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Узнать больше" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Узнать больше о том, что является публи #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Параметры сообщений" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Сообщения<<<<<<< HEAD" +msgstr "Сообщения" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "Модератор решил установить общее предупреждение на контент.<<<<<<< HEAD" +msgstr "Модератор решил установить общее предупреждение на контент." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Мои ленты" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Имя<<<<<<< HEAD" +msgstr "Имя" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Нет изображения" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Пока нет лайков<<<<<<< HEAD" +msgstr "Пока нет лайков" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Сейчас" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Нагота<<<<<<< HEAD" +msgstr "Нагота" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Открывает форму сброса пароля" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "Люди, которые подписаны на @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "Пост удалён" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Не удалось загрузить пост. Проверьте подключение к Интернету и повторите попытку.<<<<<<< HEAD" +msgstr "Не удалось загрузить пост. Проверьте подключение к Интернету и повторите попытку." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Профиль изменён" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Цитирование постов отключено" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Цитаты<<<<<<< HEAD" +msgstr "Цитаты" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Вы сделали репост" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Сбросить состояние входа в систему" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Сбросить пароль<<<<<<< HEAD" +msgstr "Сбросить пароль" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Наука<<<<<<< HEAD" +msgstr "Наука" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Добавить дату рождения" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Изменение пароля<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Изменение пароля" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Показывать ответы" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Показывать ответы<<<<<<< HEAD" +msgstr "Показывать ответы" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Показать предупреждения" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Показать предупреждения и фильтровать из ленты<<<<<<< HEAD" +msgstr "Показать предупреждения и фильтровать из ленты" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Спам" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Предложения для вас" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Неприличный<<<<<<< HEAD" +msgstr "Неприличный" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Условия" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Условия использования<<<<<<< HEAD" +msgstr "Условия использования" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Возникла проблема соединения с серверо #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Возникла проблема с загрузкой уведомлений. Нажмите здесь, чтобы повторить попытку.<<<<<<< HEAD" +msgstr "Возникла проблема с загрузкой уведомлений. Нажмите здесь, чтобы повторить попытку." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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! Мы активируем вашу учётную запись как только сможем.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Произошёл наплыв новых пользователей в Bluesky! Мы активируем вашу учётную запись как только сможем." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "Данный сервис модерации недоступен. Просмотрите детали ниже. Если проблема не исчезнет, свяжитесь с нами.<<<<<<< HEAD" +msgstr "Данный сервис модерации недоступен. Просмотрите детали ниже. Если проблема не исчезнет, свяжитесь с нами." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 {# репостов}})<<<<<<< HEAD" +msgstr "Отменить репост ({0, plural, one {# репост} few {# репоста} other {# репостов}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Подписка на список отменена" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Посмотреть запись в блоге для получени #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Просмотреть запись для отладки<<<<<<< HEAD" +msgstr "Просмотреть запись для отладки" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Просмотр отключённых учётных записей" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Просмотреть свои верификации<<<<<<< HEAD" +msgstr "Просмотреть свои верификации" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/sv/messages.po b/src/locale/locales/sv/messages.po index cb1dbacd7..17b0e7058 100644 --- a/src/locale/locales/sv/messages.po +++ b/src/locale/locales/sv/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {följd} other {följda}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, one {inlägg} other {inlägg}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Tillgänglighet" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Tillgänglighetsinställningar<<<<<<< HEAD" +msgstr "Tillgänglighetsinställningar" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Tillgänglighetsinställningar<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Konto<<<<<<< HEAD" +msgstr "Konto" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Konto ignorerat av lista" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Kontoalternativ<<<<<<< HEAD" +msgstr "Kontoalternativ" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: 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" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Meddelande" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Verifiering införs på Bluesky<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Verifiering införs på Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Alla>>>>>>> upstream/main" +msgstr "Alla" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Applösenord" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Begär omprövning av beslutet" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Tillämpa pull request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "Tilldela ämne för algoritm" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "Minst 8 tecken<<<<<<< HEAD" +msgstr "Minst 8 tecken" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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<<<<<<< HEAD" +msgstr "Födelsedag" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Blockera konton" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Blockera och radera<<<<<<< HEAD" +msgstr "Blockera och radera" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Blockera användare" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Blockera användare<<<<<<< HEAD" +msgstr "Blockera användare" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Avbryt återaktivering och logga ut" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Avbryt sökning<<<<<<< HEAD" +msgstr "Avbryt sökning" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Kopiera författarens DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kopiera kod<<<<<<< HEAD" +msgstr "Kopiera kod" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Anpassad" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Anpassningsalternativ<<<<<<< HEAD" +msgstr "Anpassningsalternativ" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Inaktivera haptisk feedback" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Inaktivera svar helt>>>>>>> upstream/main" +msgstr "Inaktivera svar helt" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Ladda ner car-fil" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ 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”)" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "Alla" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "Allt annat<<<<<<< HEAD" +msgstr "Allt annat" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Slutför" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Följer" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Följer<<<<<<< HEAD" +msgstr "Följer" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Glömt?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Befria ditt flöde<<<<<<< HEAD" +msgstr "Befria ditt flöde" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Ge din profil ett ansikte<<<<<<< HEAD" +msgstr "Ge din profil ett ansikte" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +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" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Har du en kod? <0>Klicka här." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Har du problem?<<<<<<< HEAD" +msgstr "Har du problem?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Dölj anpassningsalternativ<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Dölj anpassningsalternativ" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Om du försöker ändra ditt användarnamn eller din e-postadress ska du göra det innan du avaktiverar." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Bilder kan inte sparas om du inte har gett appen åtkomst till ditt bildbibliotek." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: 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" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "I appen, Push, Från personer du följer" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ange koden som har skickats till dig via e-post" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "Markerat av {0}." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Markerat av användaren.<<<<<<< HEAD" +msgstr "Markerat av användaren." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Läs mer" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "Läs mer om ålderskontroll<<<<<<< HEAD" +msgstr "Läs mer om ålderskontroll" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "Läs mer i dina <0>kontoinställningar." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "Gillamarkeringar på dina återpubliceringar" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "Notiser för gillamarkeringar på dina återpubliceringar<<<<<<< HEAD" +msgstr "Notiser för gillamarkeringar på dina återpubliceringar" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Meddelandealternativ" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Meddelanden<<<<<<< HEAD" +msgstr "Meddelanden" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "En moderator har valt att sätta en allmän varning på innehållet." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Mina flöden" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Namn<<<<<<< HEAD" +msgstr "Namn" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "Ingen bild" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Inga gillamarkeringar ännu<<<<<<< HEAD" +msgstr "Inga gillamarkeringar ännu" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Nu" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Naket<<<<<<< HEAD" +msgstr "Naket" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Öppnar inställningar för inläggsspråk" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Personer jag följer" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Personer du följer" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Omnämnda>>>>>>> upstream/main" +msgstr "Omnämnda" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Inlägget kunde inte laddas upp. Kontrollera din internetanslutning och försök igen." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Citatinlägg inaktiverade" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Citat<<<<<<< HEAD" +msgstr "Citat" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Återpublicerat av dig" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "Återpubliceringar<<<<<<< HEAD" +msgstr "Återpubliceringar" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Återställ status för kom-igång-guide" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Återställ lösenord<<<<<<< HEAD" +msgstr "Återställ lösenord" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Vetenskap<<<<<<< HEAD" +msgstr "Vetenskap" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Ange födelsedatum" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Ange nytt lösenord<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Ange nytt lösenord" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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>>>>>>> upstream/main" +msgstr "Ställ in exakt vilka grupper av människor som kan svara på ditt inlägg" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Visa svar" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Visa svar i<<<<<<< HEAD" +msgstr "Visa svar i" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Visa varning" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Visa varning och filtrera i flöden<<<<<<< HEAD" +msgstr "Visa varning och filtrera i flöden" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Suggestivt" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Villkor" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Användarvillkor<<<<<<< HEAD" +msgstr "Användarvillkor" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Ett problem uppstod med anslutningen till servern. Kontrollera din inter #: 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.<<<<<<< HEAD" +msgstr "Ett problem uppstod med att hämta notiser. Tryck här för att försöka igen." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Det har varit en rusning av nya användare till Bluesky! Vi kommer att aktivera ditt konto så snart vi kan." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 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" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +msgstr "Den här modereringstjänsten är inte tillgänglig. Se nedan för mer information. Kontakta oss om problemet kvarstår." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Ångra återpublicering ({0, plural, one {# återpublicering} other {# återpubliceringar}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "Avslutade prenumeration på lista" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "Videotypen stöds inte: {mimeType}<<<<<<< HEAD" +msgstr "Videotypen stöds inte: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Se blogginlägget för mer information" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Visa loggpost<<<<<<< HEAD" +msgstr "Visa loggpost" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Visa de konton du har ignorerat" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "Visa dina verifieringar<<<<<<< HEAD" +msgstr "Visa dina verifieringar" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Våldsamt eller hotfullt innehåll>>>>>>> upstream/main" +msgstr "Våldsamt eller hotfullt innehåll" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Varför borde den här användaren granskas?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/th/messages.po b/src/locale/locales/th/messages.po index 8ff15d397..47030f089 100644 --- a/src/locale/locales/th/messages.po +++ b/src/locale/locales/th/messages.po @@ -98,7 +98,7 @@ msgstr "" #: src/components/ProfileHoverCard/index.web.tsx:448 #: src/screens/Profile/Header/Metrics.tsx:26 msgid "{0, plural, one {following} other {following}}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "การเข้าถึง" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "การตั้งค่าการเข้าถึง<<<<<<< HEAD" +msgstr "การตั้งค่าการเข้าถึง" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "การตั้งค่าการเข้าถึง<<<<<<< HEAD #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "บัญชี<<<<<<< HEAD" +msgstr "บัญชี" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "บัญชีถูกปิดเสียงโดยลิสต์ #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "ตัวเลือกบัญชี<<<<<<< HEAD" +msgstr "ตัวเลือกบัญชี" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "รหัสผ่านแอป<<<<<<< HEAD" +msgstr "รหัสผ่านแอป" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "อุทธรณ์การตัดสินใจนี้<<<<<<< HEAD" +msgstr "อุทธรณ์การตัดสินใจนี้" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "ใช้ฟีดที่แนะนำตามค่าเริ่ #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "วันเกิด<<<<<<< HEAD" +msgstr "วันเกิด" #: 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." @@ -1446,7 +1446,7 @@ msgstr "บล็อกบัญชี" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "การบล็อกจะไม่ป้องกันไม่ให้ป้ายถูกวางบนบัญชีของคุณ แต่จะหยุดบัญชีนี้จากการตอบในกระทู้ของคุณหรือมีปฏิสัมพันธ์กับคุณ" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "หนังสือ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "ยกเลิกการเปิดใช้งานใหม่แ #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "ยกเลิกการค้นหา<<<<<<< HEAD" +msgstr "ยกเลิกการค้นหา" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "คัดลอกโค้ด<<<<<<< HEAD" +msgstr "คัดลอกโค้ด" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "กำหนดเอง" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "ปิดการยืนยันตัวตนสองชั้น #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "ปิดการตอบสนองแบบสั่น<<<<<<< HEAD<<<<<<< HEAD" +msgstr "ปิดการตอบสนองแบบสั่น" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "ดาวน์โหลด Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "ดาวน์โหลดไฟล์ CAR<<<<<<< HEAD" +msgstr "ดาวน์โหลดไฟล์ CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "ทุกคน" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "เสร็จสิ้น" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "ฟิตเนส<<<<<<< HEAD=======" +msgstr "ฟิตเนส" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "ติดตาม" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "ติดตาม<<<<<<< HEAD" +msgstr "ติดตาม" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "ลืมเหรอ?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "ทำให้โปรไฟล์ของคุณมีความน่าสนใจขึ้น<<<<<<< HEAD" +msgstr "ทำให้โปรไฟล์ของคุณมีความน่าสนใจขึ้น" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "การสัมผัส" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "มีปัญหาใช่ไหม?<<<<<<< HEAD" +msgstr "มีปัญหาใช่ไหม?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "หากคุณพยายามเปลี่ยนแฮนด์เดิ้ลของคุณ ให้ทำการเปลี่ยนก่อนที่คุณจะหยุดใช้งานบัญชีนี้" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "กรอกรหัสผ่านสำหรับการลบบ #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "กรอกรหัสที่ถูกส่งไปยังอีเมลของคุณ<<<<<<< HEAD<<<<<<< HEAD" +msgstr "กรอกรหัสที่ถูกส่งไปยังอีเมลของคุณ" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "มาร์คโดย {0}" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "มาร์คโดยผู้สร้าง<<<<<<< HEAD" +msgstr "มาร์คโดยผู้สร้าง" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "เรียนรู้เพิ่มเติม" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "เรียนรู้เพิ่มเติมเกี่ยวก #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "ข้อความ<<<<<<< HEAD" +msgstr "ข้อความ" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "ผู้ดูแลระบบเลือกที่จะตั้งคำเตือนทั่วไปบนเนื้อหา<<<<<<< HEAD" +msgstr "ผู้ดูแลระบบเลือกที่จะตั้งคำเตือนทั่วไปบนเนื้อหา" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "ฟีตของฉัน" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "ชื่อ<<<<<<< HEAD" +msgstr "ชื่อ" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "ยังไม่มีสิ่งที่ชอบ<<<<<<< HEAD" +msgstr "ยังไม่มีสิ่งที่ชอบ" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "ตอนนี้" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "การโป๊เปลือย<<<<<<< HEAD" +msgstr "การโป๊เปลือย" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "เปิดการรีเซ็ตรหัสผ่าน" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "ผู้คนที่ติดตาม @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "โพสต์ถูกลบแล้ว" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "โปรไฟล์ได้รับการอัปเดต" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "ยกเลิกการโควท" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "โควท<<<<<<< HEAD" +msgstr "โควท" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "รีโพสต์โดยคุณ" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "รีเซ็ตสถานะการเริ่มต้นใช #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "รีเซ็ตรหัสผ่าน<<<<<<< HEAD" +msgstr "รีเซ็ตรหัสผ่าน" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "วิทยาศาสตร์<<<<<<< HEAD" +msgstr "วิทยาศาสตร์" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "ตั้งเดือนเกิด" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "ตั้งรหัสผ่านใหม่<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "ตั้งรหัสผ่านใหม่" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "แสดงคำเตือน" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "แสดงคำเตือนและกรองจากฟีด<<<<<<< HEAD" +msgstr "แสดงคำเตือนและกรองจากฟีด" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "สแปม" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "แนะนำสำหรับคุณ" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "ชี้นำ<<<<<<< HEAD" +msgstr "ชี้นำ" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "เงื่อนไข" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "เงื่อนไขการให้บริการ<<<<<<< HEAD" +msgstr "เงื่อนไขการให้บริการ" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "" #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "เกิดปัญหาในการดึงการแจ้งเตือน คลิกที่นี่เพื่อลองอีกครั้ง<<<<<<< HEAD" +msgstr "เกิดปัญหาในการดึงการแจ้งเตือน คลิกที่นี่เพื่อลองอีกครั้ง" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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 เป็นจำนวนมาก! เราจะรีบเปิดใช้งานบัญชีของคุณอย่างเร็วที่สุด<<<<<<< HEAD<<<<<<< HEAD" +msgstr "มีผู้ใช้ใหม่เข้ามาที่ Bluesky เป็นจำนวนมาก! เราจะรีบเปิดใช้งานบัญชีของคุณอย่างเร็วที่สุด" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "เลิกสมัครรับข้อมูลจากลิส #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "ดูบล็อกโพสต์สำหรับรายละเ #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "ดูลิสต์ดีบัก<<<<<<< HEAD" +msgstr "ดูลิสต์ดีบัก" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "ดูบัญชีที่คุณปิดเสียง" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/tr/messages.po b/src/locale/locales/tr/messages.po index 680435787..4188d94b5 100644 --- a/src/locale/locales/tr/messages.po +++ b/src/locale/locales/tr/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, other {takip edilen}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, other {gönderi}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Erişilebilirlik" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Erişilebilirlik Ayarları<<<<<<< HEAD" +msgstr "Erişilebilirlik Ayarları" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Erişilebilirlik Ayarları<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Hesap<<<<<<< HEAD" +msgstr "Hesap" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Liste Tarafından Hesap Susturuldu" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Hesap seçenekleri<<<<<<< HEAD" +msgstr "Hesap seçenekleri" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "Hayvan istismarı>>>>>>> upstream/main" +msgstr "Hayvan istismarı" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "Duyuru" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "Bluesky'da doğrulamayı duyurma<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky'da doğrulamayı duyurma" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr "Herkes>>>>>>> upstream/main" +msgstr "Herkes" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Uygulama şifreleri" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Bu karara itiraz et" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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<<<<<<< HEAD" +msgstr "Pull Request'i uygula" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +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<<<<<<< HEAD" +msgstr "En az 8 karakter" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: 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" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ 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ü<<<<<<< HEAD" +msgstr "Doğum günü" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Hesapları engelle" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Engelle ve Sil<<<<<<< HEAD" +msgstr "Engelle ve Sil" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Kullanıcıyı engelle" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Kullanıcıyı Engelle<<<<<<< HEAD" +msgstr "Kullanıcıyı Engelle" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "Yeniden etkinleştirmeyi iptal et ve çıkış yap" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Aramayı iptal et<<<<<<< HEAD" +msgstr "Aramayı iptal et" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: 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)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "Yazar DID'ini kopyala" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Kodu kopyala<<<<<<< HEAD" +msgstr "Kodu kopyala" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Özel" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Özelleştirme seçenekleri<<<<<<< HEAD" +msgstr "Özelleştirme seçenekleri" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Dokunsal geribildirimi devre dışı bırak" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -2852,7 +2852,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:459 msgid "Disable replies entirely" -msgstr "Yanıtları tümden devre dışı bırak>>>>>>> upstream/main" +msgstr "Yanıtları tümden devre dışı bırak" #: src/screens/Settings/DeerSettings.tsx:569 #: src/screens/Settings/DeerSettings.tsx:574 @@ -2867,7 +2867,7 @@ msgstr "" #: src/screens/Settings/DeerSettings.tsx:557 #: src/screens/Settings/DeerSettings.tsx:562 msgid "Disable Saves Metrics" -msgstr "=======" +msgstr "" #: src/components/Post/Embed/VideoEmbed/VideoEmbedInner/web-controls/VideoControls.tsx:388 msgid "Disable subtitles" @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "CAR dosyasını indir" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "Özel bilgi ifşası>>>>>>> upstream/main" +msgstr "Özel bilgi ifşası" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ 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" +msgstr "Geri kalan her şey" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "Bitir" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Fitness<<<<<<< HEAD=======" +msgstr "Fitness" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Takip ediliyor" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Takiptekiler<<<<<<< HEAD" +msgstr "Takiptekiler" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Unuttunuz mu?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "Akışınızı özgürleştirin<<<<<<< HEAD" +msgstr "Akışınızı özgürleştirin" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Profilinize bir yüz ekleyin<<<<<<< HEAD" +msgstr "Profilinize bir yüz ekleyin" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "Reşit olmayanlara yönelik cinsel yönlendirme ya da sarkıntılık dav #: 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ı" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "Kodunuz var mı? <0>Buraya tıklayın." #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Sorun mu yaşıyorsunuz?<<<<<<< HEAD" +msgstr "Sorun mu yaşıyorsunuz?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Özelleştirme seçeneklerini gizle<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Özelleştirme seçeneklerini gizle" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +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." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ 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.<<<<<<< HEAD" +msgstr "Fotoğraf galerinize erişim izni verilmedikçe görseller kaydedilemez." #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: 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" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ 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<<<<<<< HEAD" +msgstr "Uygulama içi, Anında, Takip ettikleriniz" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Size e-posta olarak gönderilen kodu girin" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0} tarafından işaretlendi." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Yazarı tarafından işaretlendi.<<<<<<< HEAD" +msgstr "Yazarı tarafından işaretlendi." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ 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" +msgstr "Yaş güvencesiyle ilgili daha çok bilgi edinin" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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.<<<<<<< HEAD" +msgstr "<0>Hesap ayarlarınızdan daha çok bilgi edinin." #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ 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<<<<<<< HEAD" +msgstr "Yeniden gönderilerinize dair beğenilerin bildirimleri" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "Mesaj seçenekleri" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Mesajlar<<<<<<< HEAD" +msgstr "Mesajlar" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Moderatör, içeriğe genel bir uyarı koymayı seçti." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Akışlarım" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ad<<<<<<< HEAD" +msgstr "Ad" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Henüz beğeni yok" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Şimdi" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Çıplaklık<<<<<<< HEAD" +msgstr "Çıplaklık" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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<<<<<<< HEAD" +msgstr "Gönderi dili ayarlarını açar" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +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" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Takip ettiklerim" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "Takip ettiğiniz kişiler" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr "Bahsettiğiniz kişiler>>>>>>> upstream/main" +msgstr "Bahsettiğiniz kişiler" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Gönderinin yollanması başarısız. Lütfen İnternet bağlantınızı kontrol edin ve tekrar deneyin." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6941,7 +6941,7 @@ msgstr "" #: 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." #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ 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<<<<<<< HEAD" +msgstr "Alıntılar" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ 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<<<<<<< HEAD" +msgstr "Yeniden gönderiler" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "Onboarding durumunu sıfırla" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Şifreyi sıfırla<<<<<<< HEAD" +msgstr "Şifreyi sıfırla" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Bilim<<<<<<< HEAD" +msgstr "Bilim" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Doğum tarihini belirle" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Yeni şifre ayarla<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Yeni şifre ayarla" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 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>>>>>>> upstream/main" +msgstr "Gönderinize hangi kişi gruplarının yanıt verebileceğini net bir şekilde belirleyin" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Yanıtları göster" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "Yanıtları şöyle göster<<<<<<< HEAD" +msgstr "Yanıtları şöyle göster" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Uyarı göster ve akışlardan filtrele" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "Size önerilenler" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Tehlikeli<<<<<<< HEAD" +msgstr "Tehlikeli" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Şartlar" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Hizmet Şartları<<<<<<< HEAD" +msgstr "Hizmet Şartları" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Sunucuya bağlanırken bir sorun oldu, lütfen internet bağlantınızı #: 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.<<<<<<< HEAD" +msgstr "Bildirimleri almakta bir sorun oluştu. Tekrar denemek için buraya dokunun." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,15 +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.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky'e bir dizi yeni kullanıcı geldi! Hesabınızı en kısa sürede etkinleştireceğiz." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" -msgstr "Bunlar varsayılan ayarlarınız>>>>>>> upstream/main" +msgstr "Bunlar varsayılan ayarlarınız" #: src/screens/Settings/DeerSettings.tsx:608 msgid "These settings might summon nasal demons! Restart the app after changing if anything breaks." -msgstr "=======" +msgstr "" #: src/screens/Settings/FollowingFeedPreferences.tsx:65 msgid "These settings only apply to the Following feed." @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "Yeniden gönderiyi geri al ({0, plural, other {# yeniden gönderi}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ 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}<<<<<<< HEAD" +msgstr "Desteklenmeyen video türü: {mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Hata ayıklama girişini görüntüle" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ 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" +msgstr "Doğrulamalarınızı görüntüleyin" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "Şiddet veya tehditkâr içerik>>>>>>> upstream/main" +msgstr "Şiddet veya tehditkâr içerik" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "Bu kullanıcı neden gözden geçirilmeli?" #: src/components/dms/AfterReportDialog.tsx:49 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?" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/uk/messages.po b/src/locale/locales/uk/messages.po index 511164526..690121517 100644 --- a/src/locale/locales/uk/messages.po +++ b/src/locale/locales/uk/messages.po @@ -98,7 +98,7 @@ 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 {читаю}}<<<<<<< HEAD" +msgstr "{0, plural, one {читаю} few {читаю} many {читаю} other {читаю}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {вподобайка} few {вподобайки} many { #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {пост} few {пости} many {постів} other {постів}}<<<<<<< HEAD" +msgstr "{0, plural, one {пост} few {пости} many {постів} other {постів}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Доступність" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Налаштування доступності<<<<<<< HEAD" +msgstr "Налаштування доступності" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Налаштування доступності<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Обліковий запис<<<<<<< HEAD" +msgstr "Обліковий запис" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "Обліковий запис ігноровано списком" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "Параметри облікового запису<<<<<<< HEAD" +msgstr "Параметри облікового запису" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +1134,11 @@ msgstr "" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "Назва повинна бути не менше 4 символів у #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "Паролі застосунку<<<<<<< HEAD" +msgstr "Паролі застосунку" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "Оскаржити це рішення<<<<<<< HEAD" +msgstr "Оскаржити це рішення" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "Застосувати рекомендовані стрічки за з #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,7 +1318,7 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Дата народження<<<<<<< HEAD" +msgstr "Дата народження" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Заблокувати облікові записи" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "Блокування не завадить додавання міток до вашого облікового запису, але це зупинить можливість цього облікового запису від коментування ваших постів чи взаємодії з вами." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Книги" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ msgstr "" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "Скасувати пошук<<<<<<< HEAD" +msgstr "Скасувати пошук" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "Скопіювати код<<<<<<< HEAD" +msgstr "Скопіювати код" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Користувацький" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Панель налагодження" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ msgstr "Вимкнути двофакторну автентифікацію е #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "Вимкнути тактильний зворотний зв'язок<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Вимкнути тактильний зворотний зв'язок" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "Завантажити Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "Завантажити CAR файл<<<<<<< HEAD" +msgstr "Завантажити CAR файл" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ msgstr "Будь-хто" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Завершити" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Фітнес<<<<<<< HEAD=======" +msgstr "Фітнес" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Читаю" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Читаю<<<<<<< HEAD" +msgstr "Читаю" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Забули пароль?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "Створити обличчя для вашого облікового запису<<<<<<< HEAD" +msgstr "Створити обличчя для вашого облікового запису" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Тактильний відгук" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Виникли проблеми?<<<<<<< HEAD" +msgstr "Виникли проблеми?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "<<<<<<< HEAD<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "Якщо намагаєтесь змінити псевдонім або адресу електронної пошти, зробіть це до деактивації облікового запису." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "Введіть пароль для видалення обліковог #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "Введіть код, надісланий вам на електронну пошту<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Введіть код, надісланий вам на електронну пошту" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0} додав мітки." #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "Автор додав мітки.<<<<<<< HEAD" +msgstr "Автор додав мітки." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Дізнатися більше" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "Дізнатися більше про те, що є публічним #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Повідомлення<<<<<<< HEAD" +msgstr "Повідомлення" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5439,7 +5439,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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 "Модератор вирішив встановити загальне попередження на вміст.<<<<<<< HEAD" +msgstr "Модератор вирішив встановити загальне попередження на вміст." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Мої стрічки" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Ім'я<<<<<<< HEAD" +msgstr "Ім'я" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "Ще немає вподобань<<<<<<< HEAD" +msgstr "Ще немає вподобань" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "Щойно" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "Оголеність<<<<<<< HEAD" +msgstr "Оголеність" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "Відкриває форму скидання пароля" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ msgstr "Люди, які читають @{0}" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "Пост видалено" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "Не вдалось завантажити пост. Будь ласка, перевірте з'єднання з інтернетом та спробуйте ще раз.<<<<<<< HEAD" +msgstr "Не вдалось завантажити пост. Будь ласка, перевірте з'єднання з інтернетом та спробуйте ще раз." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Профіль оновлено" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ msgstr "Цитування постів вимкнено" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "Цитування<<<<<<< HEAD" +msgstr "Цитування" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "Ви зробили репост" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "Скинути пароль<<<<<<< HEAD" +msgstr "Скинути пароль" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Наука<<<<<<< HEAD" +msgstr "Наука" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Додати дату народження" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Встановити новий пароль<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Встановити новий пароль" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "Показувати відповіді" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "Показати попередження" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "Показати попередження і фільтрувати зі стрічки<<<<<<< HEAD" +msgstr "Показати попередження і фільтрувати зі стрічки" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Спам" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ msgstr "Пропоновано для вас" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "Непристойний<<<<<<< HEAD" +msgstr "Непристойний" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "Умови" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "Умови Використання<<<<<<< HEAD" +msgstr "Умови Використання" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Виникла проблема зі з'єднанням з сервер #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "Виникла проблема з завантаженням сповіщень. Натисніть тут, щоб повторити спробу.<<<<<<< HEAD" +msgstr "Виникла проблема з завантаженням сповіщень. Натисніть тут, щоб повторити спробу." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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! Ми активуємо ваш обліковий запис як тільки зможемо.<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Відбувався наплив нових користувачів у Bluesky! Ми активуємо ваш обліковий запис як тільки зможемо." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "Даний сервіс модерації недоступний. Перегляньте деталі нижче. Якщо проблема не зникне, зв'яжіться з нами.<<<<<<< HEAD" +msgstr "Даний сервіс модерації недоступний. Перегляньте деталі нижче. Якщо проблема не зникне, зв'яжіться з нами." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Відписано від списку" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "Докладніше у публікації в блозі" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "Переглянути запис для налагодження<<<<<<< HEAD" +msgstr "Переглянути запис для налагодження" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "Переглянути ігноровані облікові запис #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/vi/messages.po b/src/locale/locales/vi/messages.po index 9eff40c74..3e39f3a26 100644 --- a/src/locale/locales/vi/messages.po +++ b/src/locale/locales/vi/messages.po @@ -98,7 +98,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, other {đang theo dõi}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ 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}}<<<<<<< HEAD" +msgstr "{0, plural, other {bài đăng}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "Trợ năng" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "Cài đặt trợ năng<<<<<<< HEAD" +msgstr "Cài đặt trợ năng" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "Cài đặt trợ năng<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "Tài khoản<<<<<<< HEAD" +msgstr "Tài khoản" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ 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<<<<<<< HEAD" +msgstr "Tùy chọn tài khoản" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1134,11 +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" +msgstr "Giới thiệu xác minh trên Bluesky" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ 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<<<<<<< HEAD" +msgstr "Mật khẩu ứng dụng" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ 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<<<<<<< HEAD" +msgstr "Kháng nghị quyết định này" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1411,7 +1411,7 @@ msgstr "" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "Ngày sinh<<<<<<< HEAD" +msgstr "Ngày sinh" #: 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." @@ -1446,7 +1446,7 @@ msgstr "Chặn tài khoản" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "Chặn và xoá<<<<<<< HEAD" +msgstr "Chặn và xoá" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "Chặn người dùng" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "Chặn người dùng<<<<<<< HEAD" +msgstr "Chặn người dùng" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +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." #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1569,7 +1569,7 @@ msgstr "Sách" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:215 msgid "Breaking site rules" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/FeedInterstitials.tsx:442 msgid "Browse more accounts on the Explore page" @@ -1716,7 +1716,7 @@ 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<<<<<<< HEAD" +msgstr "Huỷ tìm kiếm" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -2372,7 +2372,7 @@ 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ã<<<<<<< HEAD" +msgstr "Sao chép mã" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "Tùy chỉnh" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "Tùy chọn tùy chỉnh<<<<<<< HEAD" +msgstr "Tùy chọn tùy chỉnh" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2611,7 +2611,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:204 msgid "Dangerous substances or drug abuse" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/Embed.tsx:168 #: src/components/dialogs/Embed.tsx:170 @@ -2653,7 +2653,7 @@ msgstr "Bảng gỡ lỗi" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:84 msgid "Deepfake adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/Settings.tsx:219 msgid "Deer" @@ -2834,7 +2834,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Tắt phản hồi xúc giác" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ 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<<<<<<< HEAD" +msgstr "Tải tệp CAR" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3083,7 +3083,7 @@ msgstr "" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:428 msgctxt "toast" msgid "Downloading video..." -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" @@ -3470,7 +3470,7 @@ 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" +msgstr "" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3803,7 +3803,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:55 msgid "False information about elections" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:292 msgid "Feed" @@ -3946,7 +3946,7 @@ msgstr "Hoàn tất" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "Thể hình<<<<<<< HEAD=======" +msgstr "Thể hình" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "Đang theo dõi" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "Đang theo dõi<<<<<<< HEAD" +msgstr "Đang theo dõi" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "Quên?" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +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" +msgstr "Chọn hình cho hồ sơ của bạn" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4395,7 +4395,7 @@ msgstr "Xúc giác" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:99 msgid "Harassment or hate" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:189 msgid "Harmful or high-risk activities" @@ -4424,7 +4424,7 @@ msgstr "" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "Gặp trục trặc?<<<<<<< HEAD" +msgstr "Gặp trục trặc?" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "Ẩn tùy chọn trùy chỉnh<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Ẩn tùy chọn trùy chỉnh" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +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." #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "<<<<<<< HEAD" +msgstr "" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "<<<<<<< HEAD" +msgstr "" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ 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<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Nhập mã đã được gởi đến email của bạn" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ 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.<<<<<<< HEAD" +msgstr "Gắn nhãn bởi người đăng." #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "Tìm hiểu thêm" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,15 +5431,15 @@ msgstr "Tuỳ chọn tin nhắn" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "Tin nhắn<<<<<<< HEAD" +msgstr "Tin nhắn" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" -msgstr "=======" +msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:177 msgid "Minor harassment or bullying" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:509 msgid "Miscellaneous notifications" @@ -5447,7 +5447,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:35 msgid "Misleading" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/Navigation.tsx:178 #: src/screens/Moderation/index.tsx:100 @@ -5508,7 +5508,7 @@ 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.<<<<<<< HEAD" +msgstr "Kiểm duyệt viên đã đặt cảnh báo chung cho nội dung." #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "Bảng tin của tôi" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "Tên<<<<<<< HEAD" +msgstr "Tên" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ 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<<<<<<< HEAD" +msgstr "Chưa có lượt thích nào" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ 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" +msgstr "Khỏa thân" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6474,7 +6474,7 @@ 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 "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ 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.<<<<<<< HEAD" +msgstr "Không đăng bài đăng được. Vui lòng kiểm tra kết nối mạng và thử lại." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -6937,11 +6937,11 @@ msgstr "Đã cập nhật hồ sơ" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:223 msgid "Promoting or selling prohibited items or services" -msgstr "<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:160 msgid "Psst! You can edit who can interact with this post." -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/StepFinished/index.tsx:391 msgid "Public" @@ -7034,7 +7034,7 @@ 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<<<<<<< HEAD" +msgstr "Trích dẫn" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ 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 "<<<<<<< HEAD" +msgstr "" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ 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<<<<<<< HEAD" +msgstr "Đặt lại mật khẩu" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "Khoa học<<<<<<< HEAD" +msgstr "Khoa học" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "Đặt ngày sinh" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "Đặt mất khẩu mới<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "Đặt mất khẩu mới" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ 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<<<<<<< HEAD" +msgstr "Hiển thị trả lời dưới dạng" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ 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<<<<<<< HEAD" +msgstr "Hiển thị cảnh báo và bộ lọc từ bảng tin" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8658,7 +8658,7 @@ msgstr "Spam" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:36 msgid "Spam or other inauthentic behavior or deception" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/lib/interests.ts:72 #: src/screens/Onboarding/index.tsx:58 @@ -8813,7 +8813,7 @@ 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<<<<<<< HEAD" +msgstr "Đề xuất" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ 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" +msgstr "Điều khoản dịch vụ" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "Có vấn đề khi kết nối với máy chủ, vui lòng kiểm tra k #: 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.<<<<<<< HEAD" +msgstr "Có vấn đề khi tải thông báo. Nhấn vào đây để thử lại." #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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ể.<<<<<<< HEAD<<<<<<< HEAD" +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ể." #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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.<<<<<<< HEAD" +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." #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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}})<<<<<<< HEAD" +msgstr "Huỷ đăng lại ({0, plural, other {# đăng lại}})" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9705,7 +9705,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:68 msgid "Unlabeled, abusive, or non-consensual adult content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Profile/components/ProfileFeedHeader.tsx:515 msgid "Unlike" @@ -9823,7 +9823,7 @@ msgstr "Đã bỏ đăng ký danh sách" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ 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<<<<<<< HEAD" +msgstr "Xem bản ghi gỡ lỗi" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ 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" +msgstr "Xem xác minh của bạn" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,11 +10308,11 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "<<<<<<< HEAD" +msgstr "" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/dialogs/LinkWarning.tsx:96 #: src/components/dialogs/LinkWarning.tsx:106 diff --git a/src/locale/locales/zh-CN/messages.po b/src/locale/locales/zh-CN/messages.po index 2e1249469..b43e0c07a 100644 --- a/src/locale/locales/zh-CN/messages.po +++ b/src/locale/locales/zh-CN/messages.po @@ -98,7 +98,7 @@ 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 {正在关注}}<<<<<<< HEAD" +msgstr "{0, plural, one {正在关注} other {正在关注}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {喜欢} other {喜欢}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {帖文} other {帖文}}<<<<<<< HEAD" +msgstr "{0, plural, one {帖文} other {帖文}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "无障碍" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "无障碍设置<<<<<<< HEAD" +msgstr "无障碍设置" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "无障碍设置<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "账户<<<<<<< HEAD" +msgstr "账户" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "该账户已被列表隐藏" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "账户选项<<<<<<< HEAD" +msgstr "账户选项" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "动物福利>>>>>>> upstream/main" +msgstr "动物福利" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "为你介绍 Bluesky 上的认证机制<<<<<<< HEAD<<<<<<< HEAD" +msgstr "为你介绍 Bluesky 上的认证机制" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "应用密码至少应含有 4 个字符" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "应用密码<<<<<<< HEAD" +msgstr "应用密码" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "暂停申诉" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "对此决定提出申诉<<<<<<< HEAD" +msgstr "对此决定提出申诉" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "使用默认推荐的动态源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "应用提交变更<<<<<<< HEAD" +msgstr "应用提交变更" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "为算法指定主题" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少应含有 8 个字符<<<<<<< HEAD" +msgstr "至少应含有 8 个字符" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "被禁用户视图绕过封禁>>>>>>> upstream/main" +msgstr "被禁用户视图绕过封禁" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ msgstr "请填写以下栏位，以开始年龄验证流程。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日<<<<<<< HEAD" +msgstr "生日" #: 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." @@ -1446,7 +1446,7 @@ msgstr "屏蔽账户" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "屏蔽并删除<<<<<<< HEAD" +msgstr "屏蔽并删除" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "屏蔽用户" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "屏蔽用户<<<<<<< HEAD" +msgstr "屏蔽用户" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "屏蔽不会阻止其继续标记你的账户，但会阻止该账户在你发布的帖文下回复或与你互动。" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "取消重新启用账户并登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "取消搜索<<<<<<< HEAD" +msgstr "取消搜索" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "儿童性虐待内容（CSAM）>>>>>>> upstream/main" +msgstr "儿童性虐待内容（CSAM）" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "复制发布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "复制代码<<<<<<< HEAD" +msgstr "复制代码" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "自定义" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自定义选项<<<<<<< HEAD" +msgstr "自定义选项" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "停用电子邮箱两步验证" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "停用触觉反馈<<<<<<< HEAD<<<<<<< HEAD" +msgstr "停用触觉反馈" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "下载 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下载 CAR 文件<<<<<<< HEAD" +msgstr "下载 CAR 文件" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "人肉搜索>>>>>>> upstream/main" +msgstr "人肉搜索" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他内容<<<<<<< HEAD" +msgstr "其他内容" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "完成" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康<<<<<<< HEAD=======" +msgstr "健康" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "正在关注" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "正在关注<<<<<<< HEAD" +msgstr "正在关注" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "忘记了？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "还你一个干净的时间线<<<<<<< HEAD" +msgstr "还你一个干净的时间线" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "为你的个人资料选择头像<<<<<<< HEAD" +msgstr "为你的个人资料选择头像" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "引诱拐骗行为" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "黑客入侵或系统攻击行为>>>>>>> upstream/main" +msgstr "黑客入侵或系统攻击行为" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "拥有验证码？<0>点击这里。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到问题了？<<<<<<< HEAD" +msgstr "遇到问题了？" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隐藏自定义选项<<<<<<< HEAD<<<<<<< HEAD" +msgstr "隐藏自定义选项" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "如果你想更改你的账户代码或电子邮箱，请记得在停用之前进行更改。" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "已保存图片" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "无法保存图片，请允许应用访问照片图库。<<<<<<< HEAD" +msgstr "无法保存图片，请允许应用访问照片图库。" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "冒充身份>>>>>>> upstream/main" +msgstr "冒充身份" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "应用内、系统推送、所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "应用内、系统推送、你关注的人<<<<<<< HEAD" +msgstr "应用内、系统推送、你关注的人" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "输入密码以删除账户" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "输入发送至你电子邮箱的验证码<<<<<<< HEAD<<<<<<< HEAD" +msgstr "输入发送至你电子邮箱的验证码" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "由 {0} 标记。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "由发布者标记。<<<<<<< HEAD" +msgstr "由发布者标记。" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "了解详情" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "深入了解年龄验证<<<<<<< HEAD" +msgstr "深入了解年龄验证" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "深入了解有关 Bluesky 公开内容的信息。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "在你的<0>账户设置了解详情<<<<<<< HEAD" +msgstr "在你的<0>账户设置了解详情" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "喜欢你转发的帖文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "喜欢你转发帖文的通知<<<<<<< HEAD" +msgstr "喜欢你转发帖文的通知" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "私信选项" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "私信<<<<<<< HEAD" +msgstr "私信" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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 "内容审核服务提供方已对该内容标记一般警告。<<<<<<< HEAD" +msgstr "内容审核服务提供方已对该内容标记一般警告。" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "我的动态源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名称<<<<<<< HEAD" +msgstr "名称" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "没有图片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "目前还没有喜欢<<<<<<< HEAD" +msgstr "目前还没有喜欢" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "现在" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸露<<<<<<< HEAD" +msgstr "裸露" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "开启密码重置申请" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "开启帖文语言设置<<<<<<< HEAD" +msgstr "开启帖文语言设置" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +6398,7 @@ msgstr "其他性虐待内容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力内容>>>>>>> upstream/main" +msgstr "其他暴力内容" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ msgstr "关注 @{0} 的用户" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我关注的人<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "我关注的人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "已删除帖文" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "帖文发布失败。请检查网络连接并重试。<<<<<<< HEAD" +msgstr "帖文发布失败。请检查网络连接并重试。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -7034,7 +7034,7 @@ msgstr "已停用帖文引用" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用<<<<<<< HEAD" +msgstr "引用" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "你已转发" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "转发<<<<<<< HEAD" +msgstr "转发" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "重置入门引导状态" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重置密码<<<<<<< HEAD" +msgstr "重置密码" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科学<<<<<<< HEAD" +msgstr "科学" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "设置出生日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "设置新密码<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "设置新密码" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "显示回复" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "将回复显示为<<<<<<< HEAD" +msgstr "将回复显示为" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "显示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "显示警告并从动态源中过滤<<<<<<< HEAD" +msgstr "显示警告并从动态源中过滤" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "为你推荐" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示<<<<<<< HEAD" +msgstr "性暗示" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "条款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服务条款<<<<<<< HEAD" +msgstr "服务条款" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "连接至服务器时出现问题。请检查网络连接并重试。" #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "刷新通知时出现问题，点击重试。<<<<<<< HEAD" +msgstr "刷新通知时出现问题，点击重试。" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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 目前迎来了大量新用户！我们将尽快启用你的账户。<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky 目前迎来了大量新用户！我们将尽快启用你的账户。" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "该内容审核提供服务不可用，请查看下方获取更多详情。如果问题持续存在，请联系我们。<<<<<<< HEAD" +msgstr "该内容审核提供服务不可用，请查看下方获取更多详情。如果问题持续存在，请联系我们。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "取消转发（{0, plural, one {# 次转发} other {# 次转发}}）" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "已从列表中取消订阅" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "不支持的视频类型：{mimeType}<<<<<<< HEAD" +msgstr "不支持的视频类型：{mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "查看博客文章以获取更多资讯" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "查看调试项目<<<<<<< HEAD" +msgstr "查看调试项目" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "查看你隐藏的账户" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "查看你的认证<<<<<<< HEAD" +msgstr "查看你的认证" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "暴力或威胁性内容>>>>>>> upstream/main" +msgstr "暴力或威胁性内容" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" diff --git a/src/locale/locales/zh-HK/messages.po b/src/locale/locales/zh-HK/messages.po index 795632c08..6099d46a6 100644 --- a/src/locale/locales/zh-HK/messages.po +++ b/src/locale/locales/zh-HK/messages.po @@ -98,7 +98,7 @@ 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 {跟緊}}<<<<<<< HEAD" +msgstr "{0, plural, one {跟緊} other {跟緊}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {讚佢} other {讚佢}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {帖文} other {帖文}}<<<<<<< HEAD" +msgstr "{0, plural, one {帖文} other {帖文}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "無障礙" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "無障礙設定<<<<<<< HEAD" +msgstr "無障礙設定" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "無障礙設定<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "帳號<<<<<<< HEAD" +msgstr "帳號" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "帳號經已被清單靜音" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "帳號設定<<<<<<< HEAD" +msgstr "帳號設定" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "虐待動物>>>>>>> upstream/main" +msgstr "虐待動物" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "同你介紹 Bluesky 上嘅認證機制<<<<<<< HEAD<<<<<<< HEAD" +msgstr "同你介紹 Bluesky 上嘅認證機制" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "App 專用密碼嘅名稱必須至少有4個字元" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "App 專用密碼<<<<<<< HEAD" +msgstr "App 專用密碼" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "申請解除停權" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "對此決定提出申訴<<<<<<< HEAD" +msgstr "對此決定提出申訴" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "使用預設嘅推薦動態源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "套用 Pull Request<<<<<<< HEAD" +msgstr "套用 Pull Request" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "爲演算法指定主題" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少 8 個字元<<<<<<< HEAD" +msgstr "至少 8 個字元" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "停權用戶嘗試逃避懲罰>>>>>>> upstream/main" +msgstr "停權用戶嘗試逃避懲罰" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ msgstr "請填寫下低欄位，以開始年齡驗證流程。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日<<<<<<< HEAD" +msgstr "生日" #: 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." @@ -1446,7 +1446,7 @@ msgstr "封鎖帳號" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "封鎖兼刪除<<<<<<< HEAD" +msgstr "封鎖兼刪除" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "封鎖用戶<<<<<<< HEAD" +msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "封鎖帳號唔會阻止佢標記你嘅帳號，但係會阻止佢喺你嘅討論串度回覆或同你互動。" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "取消重新啓動兼登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "唔再搵嘢<<<<<<< HEAD" +msgstr "唔再搵嘢" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "兒童性虐待內容（CSAM）>>>>>>> upstream/main" +msgstr "兒童性虐待內容（CSAM）" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "複製發布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "複製程式碼<<<<<<< HEAD" +msgstr "複製程式碼" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "自訂" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自訂選項<<<<<<< HEAD" +msgstr "自訂選項" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "停用電郵雙重驗證" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "停用觸覺回饋<<<<<<< HEAD<<<<<<< HEAD" +msgstr "停用觸覺回饋" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "下載 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下載 CAR 檔案<<<<<<< HEAD" +msgstr "下載 CAR 檔案" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "網上起底>>>>>>> upstream/main" +msgstr "網上起底" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他內容<<<<<<< HEAD" +msgstr "其他內容" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "攪掂" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康<<<<<<< HEAD=======" +msgstr "健康" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "跟緊" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "跟緊<<<<<<< HEAD" +msgstr "跟緊" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "唔記得？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "光復 Timeline<<<<<<< HEAD" +msgstr "光復 Timeline" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "整張相喺你嘅 profile 嗰度先啦<<<<<<< HEAD" +msgstr "整張相喺你嘅 profile 嗰度先啦" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "性誘識行爲" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "黑客入侵或系統攻擊>>>>>>> upstream/main" +msgstr "黑客入侵或系統攻擊" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "有咗代碼？<0>撳呢度。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到問題？<<<<<<< HEAD" +msgstr "遇到問題？" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隱藏自訂選項<<<<<<< HEAD<<<<<<< HEAD" +msgstr "隱藏自訂選項" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "喺停用帳號前，記得確認你係咪需要變更你嘅帳號代碼或電郵。" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "圖片經已儲存" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "儲存唔到圖片，需要授予相片圖庫取用權限。<<<<<<< HEAD" +msgstr "儲存唔到圖片，需要授予相片圖庫取用權限。" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "冒充身份>>>>>>> upstream/main" +msgstr "冒充身份" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "App 內，推播，所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "App 內，推播，你跟嘅人<<<<<<< HEAD" +msgstr "App 內，推播，你跟嘅人" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "輸入密碼去刪除帳號" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "輸入電郵到你嘅驗證碼<<<<<<< HEAD<<<<<<< HEAD" +msgstr "輸入電郵到你嘅驗證碼" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "{0} 所標記。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "發布者所標記。<<<<<<< HEAD" +msgstr "發布者所標記。" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "想知多啲" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "想知多啲年齡驗證<<<<<<< HEAD" +msgstr "想知多啲年齡驗證" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "想知多啲 Bluesky 上面公開嘅內容。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "想知多啲去你嘅<0>帳號設定。<<<<<<< HEAD" +msgstr "想知多啲去你嘅<0>帳號設定。" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "讚好你轉發嘅帖文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "讚好你轉發嘅帖文之通知<<<<<<< HEAD" +msgstr "讚好你轉發嘅帖文之通知" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "訊息選項" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "傾偈<<<<<<< HEAD" +msgstr "傾偈" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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 "內容審覈服務提供者經已將呢個內容標記普通警告。<<<<<<< HEAD" +msgstr "內容審覈服務提供者經已將呢個內容標記普通警告。" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "我嘅動態源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名稱<<<<<<< HEAD" +msgstr "名稱" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "冇圖片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "仲未有人讚<<<<<<< HEAD" +msgstr "仲未有人讚" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "而家" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸體<<<<<<< HEAD" +msgstr "裸體" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "打開密碼重設表單" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "打開帖文語言設定<<<<<<< HEAD" +msgstr "打開帖文語言設定" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +6398,7 @@ msgstr "其他性虐待內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力內容>>>>>>> upstream/main" +msgstr "其他暴力內容" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ msgstr "跟緊 @{0} 嘅人" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我跟嘅人<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "我跟嘅人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "帖文經已刪除" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "帖文發布失敗。請檢查你嘅互聯網連線，跟住試多次。<<<<<<< HEAD" +msgstr "帖文發布失敗。請檢查你嘅互聯網連線，跟住試多次。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -7034,7 +7034,7 @@ msgstr "引用帖文經已停用" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用<<<<<<< HEAD" +msgstr "引用" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "你所轉發" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "轉發<<<<<<< HEAD" +msgstr "轉發" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "去返引導流程重設個人檔案" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重設密碼<<<<<<< HEAD" +msgstr "重設密碼" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科學<<<<<<< HEAD" +msgstr "科學" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "設定出世日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "設定新密碼<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "設定新密碼" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "顯示回覆" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "回覆顯示成<<<<<<< HEAD" +msgstr "回覆顯示成" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "顯示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "顯示警告兼且喺動態源度篩選<<<<<<< HEAD" +msgstr "顯示警告兼且喺動態源度篩選" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "估你心水" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示<<<<<<< HEAD" +msgstr "性暗示" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "條款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服務條款<<<<<<< HEAD" +msgstr "服務條款" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "連線到伺服器嗰陣出咗問題，請檢查互聯網連線跟住試 #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "攞緊通知嗰陣出咗問題，撳呢度試多次。<<<<<<< HEAD" +msgstr "攞緊通知嗰陣出咗問題，撳呢度試多次。" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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 家陣有一大班人加入！我哋會盡快啓用你嘅帳號。<<<<<<< HEAD<<<<<<< HEAD" +msgstr "Bluesky 家陣有一大班人加入！我哋會盡快啓用你嘅帳號。" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "呢個內容審覈服務用唔到，留意下低瞭解更多資訊。若然呢個問題仲係持續發生，請聯絡我哋。<<<<<<< HEAD" +msgstr "呢個內容審覈服務用唔到，留意下低瞭解更多資訊。若然呢個問題仲係持續發生，請聯絡我哋。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "唔再轉發（{0, plural, one {# 次轉發} other {# 次轉發}}）" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "經已喺清單度唔再訂閱" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "唔支援嘅影片類型：{mimeType}<<<<<<< HEAD" +msgstr "唔支援嘅影片類型：{mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "睇下網誌文章嚟了解更多資訊" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "睇下調試條目<<<<<<< HEAD" +msgstr "睇下調試條目" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "睇下你靜音咗嘅帳號" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "睇下你嘅認證<<<<<<< HEAD" +msgstr "睇下你嘅認證" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "暴力或威嚇性內容>>>>>>> upstream/main" +msgstr "暴力或威嚇性內容" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility" @@ -10592,7 +10592,7 @@ msgstr "點解要審查呢個用戶？" #: src/components/dms/AfterReportDialog.tsx:49 msgid "Would you like to block this user and/or delete this conversation?" -msgstr "需要封鎖呢個用戶或刪除呢個對話，定一齊執行？>>>>>>> upstream/main" +msgstr "需要封鎖呢個用戶或刪除呢個對話，定一齊執行？" #: src/screens/Messages/components/MessageInput.tsx:154 #: src/screens/Messages/components/MessageInput.web.tsx:214 diff --git a/src/locale/locales/zh-TW/messages.po b/src/locale/locales/zh-TW/messages.po index 987761e33..c7c063bf2 100644 --- a/src/locale/locales/zh-TW/messages.po +++ b/src/locale/locales/zh-TW/messages.po @@ -98,7 +98,7 @@ 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 {個跟隨中}}<<<<<<< HEAD" +msgstr "{0, plural, one {個跟隨中} other {個跟隨中}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:492 msgid "{0, plural, one {like} other {likes}}" @@ -106,7 +106,7 @@ msgstr "{0, plural, one {個喜歡} other {個喜歡}}" #: src/screens/Profile/Header/Metrics.tsx:58 msgid "{0, plural, one {post} other {posts}}" -msgstr "{0, plural, one {則貼文} other {則貼文}}<<<<<<< HEAD" +msgstr "{0, plural, one {則貼文} other {則貼文}}" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:474 msgid "{0, plural, one {quote} other {quotes}}" @@ -595,7 +595,7 @@ msgstr "無障礙" #: src/Navigation.tsx:384 msgid "Accessibility Settings" -msgstr "無障礙設定<<<<<<< HEAD" +msgstr "無障礙設定" #: src/Navigation.tsx:408 #: src/screens/Login/LoginForm.tsx:197 @@ -603,7 +603,7 @@ msgstr "無障礙設定<<<<<<< HEAD" #: src/screens/Settings/Settings.tsx:175 #: src/screens/Settings/Settings.tsx:178 msgid "Account" -msgstr "帳號<<<<<<< HEAD" +msgstr "帳號" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:461 #: src/screens/Messages/components/RequestButtons.tsx:91 @@ -634,7 +634,7 @@ msgstr "帳號已被列表靜音" #: src/screens/Settings/Settings.tsx:633 msgid "Account options" -msgstr "帳號設定<<<<<<< HEAD" +msgstr "帳號設定" #: src/components/dialogs/ServerInput.tsx:141 msgid "Account provider" @@ -1116,7 +1116,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:130 msgid "Animal welfare" -msgstr "虐待動物>>>>>>> upstream/main" +msgstr "虐待動物" #: src/lib/interests.ts:52 #: src/screens/Onboarding/index.tsx:60 @@ -1134,11 +1134,11 @@ msgstr "公告" #: src/components/dialogs/nuxs/InitialVerificationAnnouncement.tsx:37 msgid "Announcing verification on Bluesky" -msgstr "為您介紹 Bluesky 上的驗證機制<<<<<<< HEAD<<<<<<< HEAD" +msgstr "為您介紹 Bluesky 上的驗證機制" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:451 msgid "Anyone" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/view/com/composer/threadgate/ThreadgateBtn.tsx:134 msgid "Anyone can interact" @@ -1189,7 +1189,7 @@ msgstr "密碼名稱必須至少包含 4 個字元" #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:71 #: src/screens/Settings/PrivacyAndSecuritySettings.tsx:74 msgid "App passwords" -msgstr "應用程式專用密碼<<<<<<< HEAD" +msgstr "應用程式專用密碼" #: src/Navigation.tsx:352 #: src/screens/Settings/AppPasswords.tsx:49 @@ -1225,7 +1225,7 @@ msgstr "申請解除停權" #: src/screens/Messages/components/ChatDisabled.tsx:111 #: src/screens/Messages/components/ChatDisabled.tsx:113 msgid "Appeal this decision" -msgstr "對此決定提出上訴<<<<<<< HEAD" +msgstr "對此決定提出上訴" #: src/Navigation.tsx:400 #: src/screens/Settings/AppearanceSettings.tsx:73 @@ -1242,7 +1242,7 @@ msgstr "使用預設推薦的動態源" #: src/screens/Settings/Settings.tsx:505 #: src/screens/Settings/Settings.tsx:507 msgid "Apply Pull Request" -msgstr "套用拉取請求 (Pull Request)<<<<<<< HEAD" +msgstr "套用拉取請求 (Pull Request)" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:675 msgid "Archived from {0}" @@ -1318,11 +1318,11 @@ msgstr "為演算法指定主題" #: src/screens/Settings/components/ChangePasswordDialog.tsx:208 msgid "At least 8 characters" -msgstr "至少 8 個字元<<<<<<< HEAD" +msgstr "至少 8 個字元" #: src/screens/Signup/StepInfo/index.tsx:176 msgid "ATmosphere" -msgstr "=======" +msgstr "" #: src/screens/Settings/ContentAndMediaSettings.tsx:116 #: src/screens/Settings/ContentAndMediaSettings.tsx:122 @@ -1364,7 +1364,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:227 msgid "Banned user returning" -msgstr "停權用戶試圖繞過懲罰>>>>>>> upstream/main" +msgstr "停權用戶試圖繞過懲罰" #: src/view/screens/Lists.tsx:42 #: src/view/screens/ModerationModlists.tsx:42 @@ -1411,7 +1411,7 @@ msgstr "請填寫以下欄位，以開始年齡驗證程序。" #: src/components/dialogs/BirthDateSettings.tsx:115 #: src/screens/Settings/AccountSettings.tsx:142 msgid "Birthday" -msgstr "生日<<<<<<< HEAD" +msgstr "生日" #: 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." @@ -1446,7 +1446,7 @@ msgstr "封鎖帳號" #: src/components/dms/AfterReportDialog.tsx:145 msgid "Block and Delete" -msgstr "封鎖並刪除<<<<<<< HEAD" +msgstr "封鎖並刪除" #: src/screens/ProfileList/components/SubscribeMenu.tsx:125 msgid "Block list" @@ -1467,7 +1467,7 @@ msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:151 msgid "Block User" -msgstr "封鎖用戶<<<<<<< HEAD" +msgstr "封鎖用戶" #: src/components/dms/AfterReportDialog.tsx:180 msgid "Block user and/or delete this conversation" @@ -1506,7 +1506,7 @@ 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" +msgstr "封鎖該帳號無法阻止其標記您的帳號，但他將無法在您的討論串中回覆，或以其他方式與您互動。" #: src/components/dialogs/ServerInput.tsx:147 #: src/components/dialogs/ServerInput.tsx:149 @@ -1716,7 +1716,7 @@ msgstr "取消重新啟用並登出" #: src/screens/Search/Shell.tsx:361 msgid "Cancel search" -msgstr "放棄搜尋<<<<<<< HEAD" +msgstr "放棄搜尋" #: src/components/PostControls/index.tsx:114 #: src/components/PostControls/index.tsx:145 @@ -1874,7 +1874,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:165 msgid "Child Sexual Abuse Material (CSAM)" -msgstr "兒少性剝削內容 (CSAM)>>>>>>> upstream/main" +msgstr "兒少性剝削內容 (CSAM)" #: src/screens/Settings/components/ChangeHandleDialog.tsx:399 msgid "Choose domain verification method" @@ -2372,7 +2372,7 @@ msgstr "複製發布者 DID" #: src/components/dialogs/Embed.tsx:190 #: src/components/dialogs/Embed.tsx:207 msgid "Copy code" -msgstr "複製程式碼<<<<<<< HEAD" +msgstr "複製程式碼" #: src/screens/Settings/components/ChangeHandleDialog.tsx:502 #: src/view/com/profile/ProfileMenu.tsx:508 @@ -2599,7 +2599,7 @@ msgstr "自訂" #: src/components/dialogs/Embed.tsx:144 msgid "Customization options" -msgstr "自訂選項<<<<<<< HEAD" +msgstr "自訂選項" #: src/screens/Onboarding/Layout.tsx:60 msgid "Customizes your Bluesky experience" @@ -2834,7 +2834,7 @@ msgstr "停用電子郵件雙重驗證" #: src/screens/Settings/AccessibilitySettings.tsx:89 #: src/screens/Settings/AccessibilitySettings.tsx:94 msgid "Disable haptic feedback" -msgstr "關閉觸覺回饋<<<<<<< HEAD<<<<<<< HEAD" +msgstr "關閉觸覺回饋" #: src/screens/Settings/DeerSettings.tsx:521 #: src/screens/Settings/DeerSettings.tsx:526 @@ -3063,7 +3063,7 @@ msgstr "下載 Bluesky" #: src/screens/Settings/components/ExportCarDialog.tsx:78 #: src/screens/Settings/components/ExportCarDialog.tsx:83 msgid "Download CAR file" -msgstr "下載 CAR 檔案<<<<<<< HEAD" +msgstr "下載 CAR 檔案" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:559 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:561 @@ -3087,7 +3087,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:115 msgid "Doxxing" -msgstr "人肉搜尋>>>>>>> upstream/main" +msgstr "人肉搜尋" #: src/view/com/composer/text-input/TextInput.web.tsx:375 msgid "Drop to add images" @@ -3470,7 +3470,7 @@ msgstr "所有人" #: src/screens/Settings/NotificationSettings/index.tsx:235 #: src/screens/Settings/NotificationSettings/MiscellaneousNotificationSettings.tsx:41 msgid "Everything else" -msgstr "其他內容<<<<<<< HEAD" +msgstr "其他內容" #: src/components/dialogs/MutedWords.tsx:316 msgid "Exclude users you follow" @@ -3946,7 +3946,7 @@ msgstr "完成" #: src/screens/Onboarding/index.tsx:66 msgid "Fitness" -msgstr "健康<<<<<<< HEAD=======" +msgstr "健康" #: src/screens/Onboarding/StepFinished/index.tsx:421 msgid "Flexible" @@ -4052,7 +4052,7 @@ msgstr "跟隨中" #: src/view/screens/Feeds.tsx:603 msgctxt "feed-name" msgid "Following" -msgstr "跟隨中<<<<<<< HEAD" +msgstr "跟隨中" #: src/components/ProfileCard.tsx:492 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:96 @@ -4143,7 +4143,7 @@ msgstr "忘記了？" #: src/screens/Onboarding/StepFinished/ValuePropositionPager.shared.tsx:12 msgid "Free your feed" -msgstr "還您一個乾淨的河道<<<<<<< HEAD" +msgstr "還您一個乾淨的河道" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:157 msgid "From" @@ -4245,7 +4245,7 @@ msgstr "" #: src/screens/Onboarding/StepProfile/index.tsx:235 msgid "Give your profile a face" -msgstr "為您的個人檔案選擇大頭貼照<<<<<<< HEAD" +msgstr "為您的個人檔案選擇大頭貼照" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:142 msgid "Glorification of violence" @@ -4364,7 +4364,7 @@ msgstr "引誘拐騙行為" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:219 msgid "Hacking or system attacks" -msgstr "駭客入侵或系統攻擊>>>>>>> upstream/main" +msgstr "駭客入侵或系統攻擊" #: src/state/shell/progress-guide.tsx:220 #: src/state/shell/progress-guide.tsx:230 @@ -4424,7 +4424,7 @@ msgstr "已經有代碼了？<0>點一下這裡。" #: src/screens/Signup/index.tsx:229 msgid "Having trouble?" -msgstr "遇到問題？<<<<<<< HEAD" +msgstr "遇到問題？" #: src/screens/Settings/Settings.tsx:243 #: src/screens/Settings/Settings.tsx:247 @@ -4486,7 +4486,7 @@ msgstr "" #: src/components/dialogs/Embed.tsx:128 msgid "Hide customization options" -msgstr "隱藏自訂選項<<<<<<< HEAD<<<<<<< HEAD" +msgstr "隱藏自訂選項" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:527 msgid "Hide lists" @@ -4677,7 +4677,7 @@ 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" +msgstr "在停用帳號前，記得確認您是否需要變更帳號代碼或電子信箱。" #: src/view/com/util/images/Gallery.tsx:80 msgid "Image" @@ -4699,7 +4699,7 @@ msgstr "已儲存圖片" #: src/lib/media/save-image.ts:51 msgid "Images cannot be saved unless permission is granted to access your photo library." -msgstr "無法儲存圖片，需要授予存取相簿的權限。<<<<<<< HEAD" +msgstr "無法儲存圖片，需要授予存取相簿的權限。" #: 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." @@ -4707,7 +4707,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:51 msgid "Impersonation" -msgstr "冒充身分>>>>>>> upstream/main" +msgstr "冒充身分" #: src/screens/Settings/NotificationSettings/index.tsx:284 msgid "In-app" @@ -4735,7 +4735,7 @@ msgstr "應用程式內、推播、所有人" #: src/screens/Settings/NotificationSettings/index.tsx:273 msgid "In-app, Push, People you follow" -msgstr "應用程式內、推播、您跟隨的人<<<<<<< HEAD" +msgstr "應用程式內、推播、您跟隨的人" #. Title message shown in chat requests inbox when it's empty #: src/screens/Messages/Inbox.tsx:231 @@ -4764,7 +4764,7 @@ msgstr "輸入密碼以刪除帳號" #: src/screens/Login/LoginForm.tsx:302 msgid "Input the code which has been emailed to you" -msgstr "輸入傳送至您電子信箱的代碼<<<<<<< HEAD<<<<<<< HEAD" +msgstr "輸入傳送至您電子信箱的代碼" #: src/screens/Settings/DeerSettings.tsx:158 msgid "Input the url of the constellations instance to use" @@ -4887,7 +4887,7 @@ msgstr "由 {0} 標記。" #: src/components/moderation/ContentHider.tsx:237 msgid "Labeled by the author." -msgstr "由發布者標記。<<<<<<< HEAD" +msgstr "由發布者標記。" #: src/screens/Settings/DeerSettings.tsx:618 msgid "Labelers" @@ -4958,7 +4958,7 @@ msgstr "瞭解詳情" #: src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx:74 msgid "Learn more about age assurance" -msgstr "深入瞭解年齡驗證<<<<<<< HEAD" +msgstr "深入瞭解年齡驗證" #: src/components/dialogs/ServerInput.tsx:223 msgid "Learn more about self hosting your PDS." @@ -4995,7 +4995,7 @@ msgstr "深入瞭解在 Bluesky 上公開的內容。" #: src/components/ageAssurance/AgeAssuranceAdmonition.tsx:86 msgid "Learn more in your <0>account settings." -msgstr "在您的<0>帳號設定瞭解詳情。<<<<<<< HEAD" +msgstr "在您的<0>帳號設定瞭解詳情。" #: src/components/dialogs/ServerInput.tsx:225 #: src/components/moderation/ContentHider.tsx:247 @@ -5125,7 +5125,7 @@ msgstr "喜歡您轉發的貼文" #: src/Navigation.tsx:485 msgid "Likes of your reposts notifications" -msgstr "喜歡您轉發貼文的通知<<<<<<< HEAD" +msgstr "喜歡您轉發貼文的通知" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:485 msgid "Likes on this post" @@ -5431,7 +5431,7 @@ msgstr "訊息選項" #: src/Navigation.tsx:778 msgid "Messages" -msgstr "訊息<<<<<<< HEAD" +msgstr "訊息" #: src/screens/Settings/DeerSettings.tsx:516 msgid "Metrics" @@ -5508,7 +5508,7 @@ 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 "內容管理服務已對該內容標記普通警告。<<<<<<< HEAD" +msgstr "內容管理服務已對該內容標記普通警告。" #: src/view/shell/desktop/Feeds.tsx:113 #: src/view/shell/desktop/Feeds.tsx:123 @@ -5652,7 +5652,7 @@ msgstr "我的動態源" #: src/components/dialogs/lists/CreateOrEditListDialog.tsx:399 msgid "Name" -msgstr "名稱<<<<<<< HEAD" +msgstr "名稱" #: src/lib/interests.ts:66 #: src/screens/Onboarding/index.tsx:53 @@ -5857,7 +5857,7 @@ msgstr "沒有圖片" #: src/components/LikedByList.tsx:84 #: src/view/com/post-thread/PostLikedBy.tsx:84 msgid "No likes yet" -msgstr "目前還沒有喜歡<<<<<<< HEAD" +msgstr "目前還沒有喜歡" #: src/components/ProfileCard.tsx:514 #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:119 @@ -6064,7 +6064,7 @@ msgstr "剛剛" #: src/view/com/composer/labels/LabelsBtn.tsx:145 #: src/view/com/composer/labels/LabelsBtn.tsx:148 msgid "Nudity" -msgstr "裸露<<<<<<< HEAD" +msgstr "裸露" #: src/lib/moderation/useLabelBehaviorDescription.ts:14 #: src/screens/Settings/NotificationSettings/index.tsx:291 @@ -6327,7 +6327,7 @@ msgstr "開啟密碼重設表單" #: src/view/com/composer/select-language/PostLanguageSelect.tsx:129 msgid "Opens post language settings" -msgstr "開啟貼文語言設定<<<<<<< HEAD" +msgstr "開啟貼文語言設定" #: src/view/com/notifications/NotificationFeedItem.tsx:1021 #: src/view/com/util/UserAvatar.tsx:613 @@ -6398,7 +6398,7 @@ msgstr "其他性虐待內容" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:154 msgid "Other violent content" -msgstr "其他暴力內容>>>>>>> upstream/main" +msgstr "其他暴力內容" #: src/components/PolicyUpdateOverlay/updates/202508/index.tsx:50 msgid "Our blog post" @@ -6474,7 +6474,7 @@ msgstr "跟隨 @{0} 的人" #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:181 #: src/screens/Settings/NotificationSettings/components/PreferenceControls.tsx:191 msgid "People I follow" -msgstr "我跟隨的人<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "我跟隨的人" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:504 msgid "People you follow" @@ -6482,7 +6482,7 @@ msgstr "" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:518 msgid "People you mention" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/lib/media/save-image.ts:59 msgid "Permission to access your photo library was denied. Please enable it in your system settings." @@ -6768,7 +6768,7 @@ msgstr "成功刪除貼文" #: src/lib/api/index.ts:186 msgid "Post failed to upload. Please check your Internet connection and try again." -msgstr "貼文發布失敗。請檢查您的網路連線，然後再試一次。<<<<<<< HEAD" +msgstr "貼文發布失敗。請檢查您的網路連線，然後再試一次。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:138 #: src/screens/PostThread/components/ThreadItemPost.tsx:112 @@ -7034,7 +7034,7 @@ msgstr "已拒絕引用貼文" #: src/screens/Settings/NotificationSettings/index.tsx:170 #: src/screens/Settings/NotificationSettings/QuoteNotificationSettings.tsx:41 msgid "Quotes" -msgstr "引用<<<<<<< HEAD" +msgstr "引用" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:467 msgid "Quotes of this post" @@ -7535,7 +7535,7 @@ msgstr "由您轉發" #: src/screens/Settings/NotificationSettings/index.tsx:181 #: src/screens/Settings/NotificationSettings/RepostNotificationSettings.tsx:41 msgid "Reposts" -msgstr "轉發<<<<<<< HEAD" +msgstr "轉發" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:448 msgid "Reposts of this post" @@ -7610,7 +7610,7 @@ msgstr "重設入門引導進度" #: src/screens/Login/ForgotPasswordForm.tsx:80 msgid "Reset password" -msgstr "重設密碼<<<<<<< HEAD" +msgstr "重設密碼" #: src/screens/Settings/DeerSettings.tsx:635 msgid "Restart the app after changing this setting." @@ -7774,7 +7774,7 @@ msgstr "" #: src/lib/interests.ts:71 #: src/screens/Onboarding/index.tsx:64 msgid "Science" -msgstr "科學<<<<<<< HEAD" +msgstr "科學" #: src/view/com/posts/PostFeedItemCarousel.tsx:67 msgid "Scroll carousel left" @@ -7782,7 +7782,7 @@ msgstr "" #: src/view/com/posts/PostFeedItemCarousel.tsx:76 msgid "Scroll carousel right" -msgstr "=======>>>>>>> upstream/main" +msgstr "" #: src/components/InterestTabs.tsx:255 msgid "Scroll left" @@ -8157,11 +8157,11 @@ msgstr "設定出生日期" #: src/screens/Login/SetNewPasswordForm.tsx:106 msgid "Set new password" -msgstr "設定新密碼<<<<<<< HEAD<<<<<<< HEAD=======" +msgstr "設定新密碼" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:475 msgid "Set precisely which groups of people can reply to your post" -msgstr ">>>>>>> upstream/main" +msgstr "" #: src/screens/Onboarding/Layout.tsx:49 msgid "Set up your account" @@ -8400,7 +8400,7 @@ msgstr "顯示回覆" #: src/screens/PostThread/components/HeaderDropdown.tsx:43 msgid "Show replies as" -msgstr "顯示回覆為<<<<<<< HEAD" +msgstr "顯示回覆為" #: src/components/PostControls/PostMenu/PostMenuItems.tsx:692 #: src/components/PostControls/PostMenu/PostMenuItems.tsx:702 @@ -8423,7 +8423,7 @@ msgstr "顯示警告" #: src/lib/moderation/useLabelBehaviorDescription.ts:59 msgid "Show warning and filter from feeds" -msgstr "顯示警告，並從動態中排除內容<<<<<<< HEAD" +msgstr "顯示警告，並從動態中排除內容" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:646 msgid "Shows information about when this post was created" @@ -8813,7 +8813,7 @@ msgstr "為您推薦" #: src/view/com/composer/labels/LabelsBtn.tsx:139 #: src/view/com/composer/labels/LabelsBtn.tsx:142 msgid "Suggestive" -msgstr "性暗示<<<<<<< HEAD" +msgstr "性暗示" #: src/Navigation.tsx:327 #: src/view/screens/Support.tsx:34 @@ -8933,7 +8933,7 @@ msgstr "條款" #: src/view/shell/Drawer.tsx:697 #: src/view/shell/Drawer.tsx:699 msgid "Terms of Service" -msgstr "服務條款<<<<<<< HEAD" +msgstr "服務條款" #: src/components/dialogs/MutedWords.tsx:271 msgid "Text & tags" @@ -9117,7 +9117,7 @@ msgstr "連線至伺服器時發生問題，請檢查您的網路連線，然後 #: src/view/com/notifications/NotificationFeed.tsx:132 msgid "There was an issue fetching notifications. Tap here to try again." -msgstr "取得通知時發生問題，按這裡重試。<<<<<<< HEAD" +msgstr "取得通知時發生問題，按這裡重試。" #: src/screens/Search/Explore.tsx:992 #: src/view/com/posts/PostFeed.tsx:798 @@ -9189,7 +9189,7 @@ 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！我們會盡快啟用您的帳號。<<<<<<< HEAD<<<<<<< HEAD" +msgstr "目前有眾多新用戶湧入 Bluesky！我們會盡快啟用您的帳號。" #: src/components/dialogs/PostInteractionSettingsDialog.tsx:654 msgid "These are your default settings" @@ -9349,7 +9349,7 @@ 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 "這項內容管理服務目前無法使用，更多資訊請參見下方。如果問題持續發生，請聯絡我們。<<<<<<< HEAD" +msgstr "這項內容管理服務目前無法使用，更多資訊請參見下方。如果問題持續發生，請聯絡我們。" #: src/screens/PostThread/components/ThreadItemAnchor.tsx:686 msgid "This post claims to have been created on <0>{0}, but was first seen by Bluesky on <1>{1}." @@ -9672,7 +9672,7 @@ 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" +msgstr "取消轉發（{0, plural, other {# 則轉發}}）" #: src/screens/Profile/Header/ProfileHeaderStandard.tsx:242 msgid "Unfollow {0}" @@ -9823,7 +9823,7 @@ msgstr "成功取消套用列表" #: src/view/com/composer/Composer.tsx:895 msgid "Unsupported video type: {mimeType}" -msgstr "不支援的影片類型：{mimeType}<<<<<<< HEAD" +msgstr "不支援的影片類型：{mimeType}" #: src/screens/Settings/components/OTAInfo.tsx:58 #: src/screens/Settings/components/OTAInfo.tsx:74 @@ -10209,7 +10209,7 @@ msgstr "閱讀部落格文章以瞭解更多資訊" #: src/screens/Log.tsx:81 msgid "View debug entry" -msgstr "檢視偵錯項目<<<<<<< HEAD" +msgstr "檢視偵錯項目" #: src/screens/VideoFeed/index.tsx:662 #: src/screens/VideoFeed/index.tsx:680 @@ -10291,7 +10291,7 @@ msgstr "檢視您靜音的帳號" #: src/components/verification/VerificationCheckButton.tsx:98 msgid "View your verifications" -msgstr "檢視您的驗證<<<<<<< HEAD" +msgstr "檢視您的驗證" #: src/view/com/util/images/AutoSizedImage.tsx:210 #: src/view/com/util/images/AutoSizedImage.tsx:237 @@ -10308,7 +10308,7 @@ msgstr "" #: src/components/moderation/ReportDialog/utils/useReportOptions.ts:127 msgid "Violent or threatening content" -msgstr "暴力或威脅性內容>>>>>>> upstream/main" +msgstr "暴力或威脅性內容" #: src/screens/Settings/DeerSettings.tsx:337 msgid "Visibility"