nostr/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2024-09-29 08:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/HEAD'

Browse Source
This commit is contained in:
Vitor Pamplona 2023-03-10 10:03:34 -05:00
commit a2d04c9908
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
View File

@ -220,12 +220,12 @@ fun NoteQuickActionMenu(note: Note, popupExpanded: Boolean, onDismiss: () -> Uni
onDismiss()
}
) {
Text("Don't show again")
Text(stringResource(R.string.quick_action_dont_show_again_button))
}
Button(
onClick = { accountViewModel.delete(note); onDismiss() }
) {
Text("Delete")
Text(stringResource(R.string.quick_action_delete_button))
}
}
}

37
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -170,4 +170,41 @@
<string name="report_hateful_speech">Denunciar discurso de ódio</string>
<string name="report_nudity_porn">Denunciar nudez / pornografia</string>
<string name="others">outros</string>
<string name="mark_all_known_as_read">Marcar todos conhecidos como lidos</string>
<string name="mark_all_new_as_read">Marcar todas novas solicitações como lidas</string>
<string name="mark_all_as_read">Marcar todas como lidas</string>
<string name="biometric_error">Erro</string>
<string name="account_backup_tips_md">
## Backup de chaves e dicas de segurança
\n\nSua conta é protegida por uma chave secreta. A chave é uma string aleatória longa começando com **nsec1**. Qualquer pessoa que tenha acesso à sua chave secreta pode publicar conteúdo usando sua identidade.
\n\n- **Não** coloque sua chave secreta em qualquer site ou software em que não confie.
\n- Os desenvolvedores do Amethyst **nunca** pedirão sua chave secreta.
\n- **Faça** um backup seguro de sua chave secreta para recuperação de conta. Recomendamos o uso de um gerenciador de senhas.
</string>
<string name="secret_key_copied_to_clipboard">Chave secreta (nsec) copiada</string>
<string name="copy_my_secret_key">Copiar minha chave secreta</string>
<string name="biometric_authentication_failed">Autenticação falhou</string>
<string name="badge_created_by">Criado por %1$s</string>
<string name="badge_award_image_for">Imagem da medalha para %1$s</string>
<string name="new_badge_award_notif">Você recebeu uma nova medalha</string>
<string name="award_granted_to">Medalha concedida para</string>
<string name="copied_note_text_to_clipboard">Texto copiado</string>
<string name="copied_user_id_to_clipboard">Copiado @npub do autor</string>
<string name="copied_note_id_to_clipboard">Copiado ID da nota (@note1)</string>
<string name="select_text_dialog_top">Selecionar texto</string>
<string name="quick_action_select">Selecionar</string>
<string name="quick_action_share_browser_link">Compartilhar link do navegador</string>
<string name="quick_action_share">Compartilhar</string>
<string name="quick_action_copy_user_id">ID do Autor</string>
<string name="quick_action_copy_note_id">ID da Nota</string>
<string name="quick_action_copy_text">Copiar texto</string>
<string name="quick_action_delete">Excluir</string>
<string name="quick_action_unfollow">Remover seguidor</string>
<string name="quick_action_follow">Seguir</string>
<string name="quick_action_request_deletion_alert_title">Pedir para excluir</string>
<string name="quick_action_request_deletion_alert_body">Amethyst solicitará que sua nota seja excluída dos relays aos quais você está conectado no momento. Não há garantia de que sua nota será excluída permanentemente desses relays ou de outros relays onde possa estar armazenada.</string>
<string name="backup_keys">Copia de segurança das chaves</string>
<string name="private_conversation_notification">&lt;Não foi possível descriptografar a mensagem privada&gt;\\n\\nVocê foi citado em uma conversa privada/criptografada entre %1$s and %2$s.</string>
<string name="quick_action_delete_button">Excluir</string>
<string name="quick_action_dont_show_again_button">Não mostar novamente</string>
</resources>

10
app/src/main/res/values/strings.xml
View File

@ -178,13 +178,7 @@
<string name="mark_all_new_as_read">Mark all New as read</string>
<string name="mark_all_as_read">Mark all as read</string>
<string name="backup_keys">Backup Keys</string>
<string name="account_backup_tips_md" tools:ignore="Typos">
## Key Backup and Safety Tips
\n\nYour account is secured by a secret key. The key is long random string starting with **nsec1**. Anyone who has access to your secret key can publish content using your identity.
\n\n- Do **not** put your secret key in any website or software you do not trust.
\n- Amethyst developers will **never** ask you for your secret key.
\n- **Do** keep a secure backup of your secret key for account recovery. We recommend using a password manager.
</string>
<string name="account_backup_tips_md" tools:ignore="Typos">" ## Key Backup and Safety Tips Your account is secured by a secret key. The key is long random string starting with **nsec1**. Anyone who has access to your secret key can publish content using your identity. - Do **not** put your secret key in any website or software you do not trust. - Amethyst developers will **never** ask you for your secret key. - **Do** keep a secure backup of your secret key for account recovery. We recommend using a password manager. "</string>
<string name="secret_key_copied_to_clipboard">Secret key (nsec) copied to clipboard</string>
<string name="copy_my_secret_key">Copy my secret key</string>
<string name="biometric_authentication_failed">Authentication failed</string>
@ -220,5 +214,7 @@
<string name="twitter_proof_url_template" translatable="false">https://twitter.com/&lt;user&gt;/status/&lt;proof post&gt;</string>
<string name="private_conversation_notification">"&lt;Unable to decrypt private message&gt;\n\nYou were cited in a private/encrypted conversation between %1$s and %2$s."</string>
<string name="quick_action_delete_button">Delete</string>
<string name="quick_action_dont_show_again_button">Don\'t show again</string>
</resources>